SEQ/ACK nr calculation
Merge remote-tracking branch 'origin/master'
Merging (only 1 line of code had to be changed)