Added connection type checking for SocketWrapper
Added functionality to socketwrapper terminator property
Changed return type from list to tuple
Merge pull request #4 from cgranade/dev

Merged bug fixes, two new instruments
Merge pull request #3 from Galvant/dev

Pull from upstream