Merge pull request #3 from GertjanReynaert/gh-pages

further improvements