Merge pull request #30 from dushansachinda/master

fixed {https://wso2.org/jira/browse/ESBJAVA-2466}