Merge pull request #29 from vexxhost/fix-issue26

Fix issue #26