Implementation of Issue-65

This PR has implemented the #65 issue.