Fixing ESBJAVA-3333
Merge pull request #58 from iuj/master

Fixing ESBJAVA-3333