Merge pull request #1 from wso2-dev/master

Syncing fork with remote master
Fixing TOOLS-2391
Merge pull request #8 from melanj/master

Fixing TOOLS-2391