Patch given for ESBJAVA-2988

Applied the patch given by Isuru Gunawardana
Merge pull request #13 from vanjikumaran/master

Patch given for ESBJAVA-2988