Merge per our email

HI Mirat,

Here is my merge request. I hope I am doing this correctly. :)