Great news.
I will tidy up my current code and post a pull request in the next couple of days.
Regards,
Willem