Modified issue-2
Merge branch 'issue-4'