Fixes issue #3
Merge pull request #16 from rcross/patch-2

Fixes issue #3