-- GEP-6, code cleanup and customPre and customPost fixes
Merge pull request #8 from pradpnayak/GEP-6

-- GEP-6, code cleanup and customPre and customPost fixes