Merge changes from production PiTimer
Update with changes from Production PiTimer