fix
Merge pull request #118 from datvikash/feature-issue-156

fix