Stuff before merging
Merge branch 'master' of github.com:jouweneel/raspi