-- MRG-4, updated all the core files
-- MRG-4, updated info.xml file for release
-- MRG-4, code cleanup, code indentation
-- MRG-4, Code cleanup and removed cruft