Merge pull request #41 from dushansachinda/master

Fixed issue reported {https://wso2.org/jira/browse/ESBJAVA-3014}