Merge branch 'gh-pages'
Final touch
Merge branch 'master' into gh-pages