Merge pull request #5 from BenBals/gh-pages

merged both
Merge pull request #6 from BenBals/development

Merge pull request #5 from BenBals/gh-pages