--worked for RG-151
-- more work on RG-151
Merge pull request #105 from pradpnayak/RG-151

--worked for RG-151