Manually merge pull request #61.