I just forked this ...

... and this is crazy.

Here's my pull request, merge it maybe.