Update from RPi

Signed-off-by: Michele <michele@webemme.net>