Changes for JIRA issues
Merge pull request #14 from wso2-dev/master

Changes for JIRA issues