Closes #8
Merge pull request #10 from terryopie/fixissue

Closes #8