Fix issue #187
Merge pull request #194 from cmaloney/issue-187

Fix issue #187