uint8_t is too small.
Merge remote-tracking branch 'benlaurie/master'