More packets and base of server handling
Merge remote-tracking branch 'origin/master'