bugfixes
we go for the longer timeout
Merge branch 'master' of https://github.com/sjennewein/FrenchySoftware