Increase the buffer size, and implement a few packets
Merge remote-tracking branch 'origin/master'