Merge branch 'master' of https://github.com/MartinSchmid1602/misc
Merge branch 'master' of https://github.com/MartinSchmid1602/misc