[Edek]

I opened a PR for this on Github.
If you want to give it a try, you can use my master until it has been merged and/or modified to be included.

It works!
thank you!