Merge branch 'gh-pages'
bug修复
Merge branch 'master' into gh-pages