fix
Merge pull request #119 from datvikash/feature-issue-154

fix