Merge pull request #6 from BenBals/development

Merge pull request #5 from BenBals/gh-pages
Merge pull request #7 from BenBals/gh-pages

Merge pull request #6 from BenBals/development