I wouldn't mind fixing that between versions 0.16 and 0.17!