--HR-227 minor changes
--HR-227 Minor fix
Merge pull request #381 from PoonamNalawade/HR-227_issues

--HR-227 minor changes