Mohan's fix for ESBJAVA-2435
Merge pull request #7 from raviu/master

Mohan's fix for ESBJAVA-2435