Merge pull request #35