Merge branch 'gh-pages'

Merged master into gh-pages to keep the latest version up online.