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

Updates for issues reported by Jas