Merge pull request #16 from wso2/master

wso2 master- wso2 dev