Merge pull request #162 from wso2connector/master
Merge janaka into master