Manually merge changes from Wangfan Fu
Applied changes from Wangfan Fu
Merge branch 'master' of github.com:yqzhang/Network-Communication
Merge pull request #22 from qdx/master

Applied changes made by Wangfan Fu