Merge branch 'gh-pages'
more fixes
Merge branch 'master' into gh-pages