remove unused param
Merge branch 'master' into gh-pages
modify doc
Merge branch 'master' into gh-pages