Fix issue 130
[Network] Fixed PeerSocket thread never ending.
Merge branch 'master' into ui