--fixes for hr-363 feedback
Merge pull request #629 from divya-jose/HR-363_feedback

--fixes for hr-363 feedback