merge changes from gh-pages