Fixing ESBJAVA-3256
Merge pull request #95 from iuj/master

Fixing ESBJAVA-3256