Merge branch 'master' into gh-pages
Merge branch 'master' into gh-pages
Open comment
Open comment
Add comment
Change to chinese comments