fix-issue-22
Merge pull request #26 from itbeaver/feature/fix-issue-22

fix-issue-22