Merge branch 'gh-pages'
update version number
update version number
Merge branch 'master' into gh-pages