Skip to content
Closes #7 and minor improvements