Fixing MULE-7021
Merge pull request #52 from machaval/mule-3.x

 Fixing MULE-7021