pulling changes from gh-pages branch