Create gh-pages branch via GitHub
merging gh-pages into master to have it easier to sync
Merge branch 'master' into gh-pages