Merging with pull request #1