Skip to content

Fixes for PR

Fixes for PR #24