Merge branch 'gh-pages'
more info in readme
Merge branch 'master' into gh-pages