fixingTOOLS-1730
fixingTOOLS-1730-2
fixingTOOLS-1730-3
fixingTOOLS-1730-4
fixingTOOLS-2582
fixingTOOLS-2582-2
Merge pull request #112 from tikaa/master

merging pull req for TOOLS-1730 and TOOLS-2582 from awanthika