Updates for changes asked by Jas to Sonia
Merge pull request #312 from yogeshchaugule/develop

Updates for changes asked by Jas to Sonia