Fixing TOOLS-2384

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

Fixing TOOLS-2384