Merge pull request #2