style changes and renamed timeout to handshakeTimeout
0.9.0