Improved handshakes
Merge pull request #38 from telehash/improved-handshakes

Improved handshakes