Fix issue #91. Merge pull request #242.