Fixing TOOLS-2403
Merge pull request #15 from wso2-dev/master

Fixing TOOLS-2403