Merge pull request #11 from pradpnayak/RG-108

-- more work on RG-108
-- more work on RG-108