Merge sfan5's raspberry pi changes