close socket
Merge remote-tracking branch 'upstream/master' into close-socket-fix
fix logic
Merge pull request #10 from cychung/close-socket-fix

close socket