pull request #360