set up page
Merge branch 'master' into gh-pages
for pages