Merge branch 'master' into gh-pages
link back to GH
Merge branch 'gh-pages'