merge pull request #39