Fixing https://wso2.org/jira/browse/CARBON-14729
Merge pull request #7 from lakmali/master

Fixing https://wso2.org/jira/browse/CARBON-14729