part of fix for ESBJAVA-3222
Merge pull request #38 from isudana/master

part of fix for ESBJAVA-3222