Merge branch 'master' into gh-pages
Fixed spelling error
Fixing config file
Merge branch 'gh-pages'