Merging pull request 1