Fixes issue #3
Merge pull request #6 from joecollins/issue#3

Fixes issue #3