api fix
more
more
more
fix
doc
Merge branch 'master' into gh-pages
update