modify author
Merge branch 'gh-pages'
merge