updated APIs
Merge branch 'gh-pages' into gh-pages-v0.2