Merge branch 'gh-pages'
Style tweak
Merge branch 'master' into gh-pages