Work done for Issue #13