Issue #29 resolved