Merge pull request #192 from pradpnayak/RG-212

Rg 212
-- worked on RG-212