removed broken handshake
merging drobison changes
Merge branch 'drobison-master'