raspberry pi changes
merged