Close #11. Seems good enough, but let's not call it
final yet.

Minor tweaks to the CPP API, too

Signed-off-by: Luca Fulchir <luker@fenrirproject.org>