Issue #37 fixed