Merging changes introduced in https://wso2.org/jira/browse/CARBON-14718
Merge pull request #19 from prabathabey/master

Merging changes introduced in https://wso2.org/jira/browse/CARBON-14718