Merge branch 'gh-pages'
update file header info
Merge branch 'master' into gh-pages