Issue #10 improvoment