Merge pull request #134 from pradpnayak/RG-181

-- fixed for RG-184