Adding https://wso2.org/jira/browse/TA-812
Merge pull request #34 from dimuthud/master

Adding https://wso2.org/jira/browse/TA-812