Issue #84 fixed