Fixes #59
Merge pull request #60 from danielghost/issue/#59

Fixes #59