merge pull request #3