Merge branch 'gh-pages'
Correct misspelling in README
Merge branch 'master' into gh-pages