Merge pull request #3