Merge pull request #157.