Skip to content

Fixes for review

Fixes for review #256