fixes
Merge pull request #99 from datvikash/feature-issue-116

fixes