I have a branch for this, but intend to open it against the 0.2 branch (once that exists) rather than doing it upstream.