Adding Viraj Purang's PR

Just hacking ...