Working on Issue #182 (requires tests/doc)