Skip to content

Merge and fixes

Merge and fixes #60