Updates for issues reported by Jas
Merge pull request #117 from yogeshchaugule/develop

Develop - Changes by Priyanka and Yogesh