added more helpers for #231.

Can probably get around to closing it soon.