Merge with pull request #215