still working on getting new devices to join
Merge remote-tracking branch 'origin/master'