fix
Merge pull request #115 from datvikash/feature-issue-159

fix