Fixed some more
Merge branch 'master' of github.com:ankka/handshake