Issue #20 fixed