updates
Merge branch 'master' of https://github.com/alanarnholt/STT4870