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

Updates for minor issues reported by Jas