Fixes issue #76
Merge pull request #79 from dthume/Issue-76

Fixes issue #76