QA-169
added support for multiple client machines