Merge pull request #3 from hfvw/gh-pages

Merge