--more changes, GEP-52
Merge pull request #33 from pradpnayak/GEP-52

--more changes, GEP-52