issue #1 resolved
Merge pull request #2 from nitin777/development_issue_1

Implementation for issue #1