Fix issue #88.
Merge pull request #89 from larrylv/fix-issue-88

Fix issue #88.