changed TCPSocket to submodule
moved proxy.run() out of the try block
Merge remote-tracking branch 'origin/master'