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

MRG-4 Bug fixes