Merging gh-pages changes to master