Merge branch 'gh-pages'
final commits
Merge branch 'master' into gh-pages