fixed deadlocks
Merge branch 'stephan' of https://github.com/sjennewein/FrenchySoftware into stephan