Merged pull request #362