adds skip button and fixes #36
Merge branch 'dev'