Fixing ESBJAVA-3245
Merge pull request #8 from manjulaRathnayaka/master

Fixing ESBJAVA-3245