fixed issue #26
Merge pull request #33 from mikeedwards/issue-26

fixed issue #26