Merge pull request #39 from dushansachinda/master

merging issue reported under {https://wso2.org/jira/browse/ESBJAVA-3094}