Fixing ESBJAVA-3332
Merge pull request #53 from lafernando/master

Fixing ESBJAVA-3332