Issue #10 closed