I created a pull request along those lines. Feel free to comment and I'll fix whatever I need to fix.
Thanks.