Merge branch 'stephan'
Merge branch 'master' of https://github.com/sjennewein/FrenchySoftware
Merge branch 'stephan'