https://wso2.org/jira/browse/TA-859
Merge pull request #6 from dimuthud/master

https://wso2.org/jira/browse/TA-859