reintroduced _running for safety reasons
Merge branch 'stephan' of https://github.com/sjennewein/FrenchySoftware into stephan