I have it already on my fork. I'll sync it and open a pull request.
my pr failed the tests, but they should pass after your PR is accepted.