Initial handling of handshake
Merge pull request #16 from breese/handshake

Initial handling of handshake