Merge pull request #32 from prabhsimransingh/develop

Get the latest code