Fixes issue #34.
Merge pull request #40 from bmallin/master

Fixes issue #34.