removed log ports - doesn't work on PI.  works on pc
Merge remote-tracking branch 'origin/master'