Merge pull request #5 from BenBals/gh-pages

merged both