Fixing ESBJAVA-3132.
Merge pull request #33 from iuj/master

Fixing ESBJAVA-3132.