fixingTOOLS-2531
fixingTOOLS-2530/2529
Merge pull request #110 from tikaa/master

fixingTOOLS-2531