I started working on this - will try to finalize tomorrow, and submit a pull request into your repo