Merge pull request #1