Merge gh-pages changes with Master #2