resolving the issue-26

Fixing the gh-26.