Minor changes
Merge branch 'dev' of https://github.com/rpauls/SAE-NoMoreTeaTime into dev