Merge pull request #397