Merge branch 'gh-pages'
BUG修正
Merge branch 'master' into gh-pages