Merge branch 'master' of https://github.com/jurenner/pi3.git