Merge pull request 435