Merging pull request #3