merging pull request 1362