Updates for QA issues
Merge pull request #303 from yogeshchaugule/develop

Updates for QA issues