fixing https://wso2.org/jira/browse/ESBJAVA-3279
Merge pull request #112 from miyuru/master

fixing https://wso2.org/jira/browse/ESBJAVA-3279