Merge pull request #17 from hfvw/master

Merge pull request #16 from hfvw/gh-pages
Merge branch 'master' into gh-pages
Merge branch 'gh-pages'