applying patch by shafreen to fix ESBJAVA-3027
Merge pull request #12 from isudana/master

applying patch by shafreen to fix ESBJAVA-3027