Skip to content

Fixes/Refactoring

Fixes/Refactoring #49