un3481

Add features: A combination of other PRs + Making the API more flexible.

3

There is a very similar PR open already here #22, in fact I just copied one of the changes made in there and updated it further. I opened this PR...