Fix commit on fix branch
Second commit for chery picking
Merge pull request #3 from KaushikRay/fix-branch

Fix branch