This is tested and ready for the master branch -- oops, wrong target. I was just working on my fork of your work... I apologize for the waste of your time.
pgaultier
