Merge pull request #37