Merging changes made from the Pi
Fixed merge errors