Issue #20 closed