Merge Vivek's pull request