Merge pull request #59.