Merge pull request #677