Merge pull request #32 from pradpnayak/RG-108

--more work on RG-108
--