Merged PR #157.