Issue #29 closed