Potential fix for #43
Merge pull request #44 from alexmcmillan/master

Potential fix for #43