merging pull request #1