Merge branch 'gh-pages'
form redo
Merge branch 'master' into gh-pages