Merge pull request #642