Merge pull request #29 from pradpnayak/GEP-52

--GEP-52, removed cruft
--more changes, GEP-52