Merge branch 'gh-pages'
fix bug
Merge branch 'master' into gh-pages