Adds handshake and connection source handling
Merge pull request #13 from bravelittlescientist/connection-handshake-fix

Adds handshake and connection source handling