merge master
Merge branch 'master' into gh-pages
Optimize, bug fix and more test
Merge branch 'master' into gh-pages