fixes
Merge pull request #98 from datvikash/feature-issue-117

fixes