Fixing TOOLS-2448
Merge pull request #40 from wso2-dev/master

Fixing TOOLS-2448