update changes from master

static pages are served from gh-pages, not master!