Merge pull request #126 from pradpnayak/RG-147

-- worked on RG-147
--worked on RG-147