Fixed merge conflicts
Merging into SmartPi