Merging pull request from Aruna