Merging pull request

Merging pull request