fixingTool2177
TOOLS-2624
Merge pull request #113 from tikaa/master

Merge pull request from awanthika for TOOLS-2624 and TOOLS-2177