fix
Merge pull request #74 from datvikash/feature-issue-97

fix