Skip to content

Fixes for #221

Fixes for #221 #636