LOADUI-803 implemented some improvements suggested in code review and made it able to work in linux and mac