changes that are live right now
Merge branch 'master' of https://github.com/otech47/STREDM3