Fixing TOOLS-2416
Merge pull request #26 from Gayany/master

Fixing TOOLS-2416