Merge branch 'gh-pages'
update
add CNAME record
Merge branch 'master' into gh-pages
update