migrated changes from gh-pages branch