Merge pull request #16 from hfvw/gh-pages

Merge pull request #15 from hfvw/master
Merge pull request #17 from hfvw/master

Merge pull request #16 from hfvw/gh-pages