Merge pull request #14 from breese/handshake

Minor acceptor and socket_base improvements