Skip to content

Fix and simplify

Fix and simplify #29