Yeah, this is probably a good idea.
I add this to issue #126  as well