fix
Merge pull request #114 from datvikash/feature-issue-161

fix