tried to merge features from the master branch ... still broken
Merge branch 'stephan' of https://github.com/sjennewein/FrenchySoftware into stephan