Expose a better API. Fixes #53
0.41.0