Willing to work on this, but as you are the author of the code it would be good if you could create a repository against which I could create a PR.