Merge branch 'master' into gh-pages

Updating the 'gh-pages' branch for github.