HR-200 FIX
hr-200 : upgrade code improvement
Merge pull request #214 from pratik-joshi/HR-200-final-fix

HR-200 FIX