merged gh-pages with master