Issue #10 implemented