added Timeout
blub
Merge branch 'master' of ssh://git@github.com/Knorke/de.htwg.wzzrd.git