Merge pull request #416