Merge pull request #239