Merge pull request #42