Issue #10- solved