Latest merging attempt

Harshal91 made a change, and I want to update my own repo