Changes for WSAS-1772
Merge pull request #26 from wso2-dev/WSAS-1772

Changes for WSAS-1772