merge pull request #7