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

Fixes issue #61