Fixes issue #61
Merge pull request #30 from walterhiggins/master

Fixes issue #61