MRG-4 Bug fixes
MRG-4 Finished 4.5.0 conversion of extension
Merge pull request #69 from Edzelopez/MRG-4

MRG-4 Bug fixes