Fix for IDENTITY-2053 provided by rajitha@wso2.com
Merge pull request #15 from cgchamath/master

Fix for IDENTITY-2053 provided by rajitha@wso2.com