Merge pull request #174 from wso2connector/master

Commit Message
Merge pull request #178 from wso2connector/chamath3

Commit Message