Better UART flowcontrol
Fix conflict
Merge branch 'angrave-master'