New simpler API, tests and doc included