Merge pull request #7 from pradpnayak/GEP-6

-- GEP-6, code cleanup and added missing file
-- GEP-6, code cleanup and customPre and customPost fixes