Merge branch 'gh-pages'
fix some spacing
Merge branch 'master' into gh-pages