Thread for Client & Server
Merging Test
Merge remote-tracking branch 'origin/QuangBranch' into TingBranch