Fixes issue #62
Merge pull request #63 from ted0000/feature/issue-62

Fixed #62