Implemented issue-1