Merge pull request #6 from pradpnayak/GEP-6

GEP-6, modified xml file according to wikki
-- GEP-6, code cleanup and added missing file