Issue #24 fixed.