improve interface
add from root
Merge branch 'master' into gh-pages