MRG-4 Bug fixes
Merge pull request #72 from Edzelopez/MRG-4

MRG-4 Bug fixes