Update api in README
Update tests
Update README
Merge branch 'master' into gh-pages
U