Merge branch 'master' into gh-pages
fixed typo
Merge branch 'gh-pages'