Pull request comments. Issue #22 implemented. Pls Merge