Merge pull request #8 from Prithvirajbilla/master

Pull request from production
Merge pull request #9 from Prithvirajbilla/production

Merge pull request #8 from Prithvirajbilla/master