[#34] - made handshake work with client