Now closes sockets if remote crashes
Merge