sync'ed gh-pages with master