Issue #10 fixed