Merge pull request #40 from dushansachinda/master

merged issue reported under {https://wso2.org/jira/browse/ESBJAVA-3036}