Merge pull request #8 from BenBals/dev

fixes - more of them
Merge remote-tracking branch 'origin/gh-pages' into dev