Merge pull request #1 from wso2-dev/master

Pull2