fix for ESBJAVA-3006
Merge pull request #30 from isudana/master

fix for ESBJAVA-3006