max ack awaiting changed to 4
Merge remote-tracking branch 'origin/master'

Conflicts:
	SrfSerial.cpp