Merge branch 'gh-pages'
updated version number (forgotten)
Merge branch 'master' into gh-pages