--MTE-39, code cleanup
--MTE-39, updated info.xml file
Merge pull request #65 from pradpnayak/MTE-39

Mte 39