Issue #54 fixed