Hardeep Pull Request

Hey Hardeep,

Send me your changes. I will merge it with my base master branch.

Thanks,
Malvik