copied over changes from gh-pages