Sounds like we should work together :)

I ended up splitting it up into 2 lines for v0.3.2, so we both win!