Skip to content

Fixes for #33

Fixes for #33 #22