Merge branch 'gh-pages'
update comment header
Merge branch 'master' into gh-pages