--GEP-52, optimized code and some code cleanup
--more code change for optimization GEP-52
--updated core file, GEP-52
Merge pull request #28 from pradpnayak/GEP-52

Gep 52