Merged pull request #365