Skip to content

Fixes and refactoring #595

Fixes and refactoring

Fixes and refactoring #595