merged with gh-pages