commiting the fix for https://wso2.org/jira/browse/CARBON-14929
Merge pull request #88 from kdchamil/master

commiting the fix for https://wso2.org/jira/browse/CARBON-14929