Merge pull request #4