Fix ESBJAVA-3211
Fix ESBJAVA-3263
Merge pull request #12 from malakasilva/master

Fix ESBJAVA-3211 & ESBJAVA-3263