Merge pull request #18 from pradpnayak/RG-108

--worked on RG-108
Merge pull request #19 from pradpnayak/RG-108

--worked on RG-108
Merge pull request #20 from pradpnayak/RG-108

-- worked on RG-108
--fixed sql file RG-108