Issue #33 closed