New api - let's merge it to master!

Any reason not to do this?