Merge pull request #1 from wso2/master

Pull latest_1