Fixes #28
Merge pull request #54 from andrewelkins/patch-2

Fixes #28