Merge pull request #40