Merge pull request #32 from prabhsimransingh/develop

Get the latest code
Merge pull request #33 from prabhsimransingh/develop_tarun

Merge pull request #32 from prabhsimransingh/develop