Merge pull request #34 from iuj/master

Fixing ESBJAVA-3136.
Merge pull request #36 from iuj/master

Fixed conflict.