I'd like to submit a PR for this in near future as I'm in midst of an implementation. Let me know if that's acceptable Cheers! π