Fixes #195
Merge pull request #196 from nelsam/issues/195

Fixes #195