That would be awesome; I already created #501 as a reference, but a patch would be very appreciated.