merge gh-pages with changes from master