merged changes from gh-pages