Merge pull request #1 from wso2/master

update from original