Fixing TOOLS-2384

Signed-off-by: Melan Nimesh <melan@apache.org>
Merge pull request #6 from melanj/master

Fixing TOOLS-2384
Merge pull request #16 from wso2-dev/master

update _25032014