Merge branch 'master' into gh-pages
Fix spelling
Merge branch 'gh-pages'