Merge branch 'gh-pages'
Merge pull request #1 from adewinter/master

Merge branch 'gh-pages'