Merge branch 'master' into gh-pages

Updating the 'gh-pages' branch for github.
Merge pull request #2 from arf1372/gh-pages

Merge branch 'master' into gh-pages