Fixing L1 ESBJAVA-3148
Merge pull request #44 from miyuru/master

Fixing L1 ESBJAVA-3148