Merge pull request #132 from pradpnayak/RG-181

-- worked on RG-181, uninstall code for accounting integration
Worked on RG-184
Merge pull request #133 from mayurjadhav/RG-184

Worked on RG-184
-- fixed for RG-184