Added connection type checking for SocketWrapper
Added functionality to socketwrapper terminator property
Changed return type from list to tuple