Merge pull request #491