Merge branch 'master', remote branch 'origin' into gh-pages
Merge branch 'master' into gh-pages
fix close bug