I believe this fixes #40
Merge pull request #41 from andrew13/patch-4

I believe this fixes #40