Added better support for Raspberry Pi