merging changes from gh-pages