Improved TCP-Server/Client functions
Removed debug breakpoint
Merge remote-tracking branch 'upstream/master'