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

Merge