Merge pull request #41