fixed small issues mentioned by Jas
fixed small issues mentioned by Jas
Merge pull request #297 from yogeshchaugule/develop

Develop - Changes by Yogesh