fix
Merge pull request #117 from datvikash/feature-issue-160

fix