merge gh-pages with branch master