Fix for ESBJAVA-3191
Merge pull request #70 from isudana/master

Fix for ESBJAVA-3191