merging https://wso2.org/jira/browse/ESBJAVA-3221
Merge pull request #77 from dushansachinda/master

merged https://wso2.org/jira/browse/ESBJAVA-3221