Timeout fix
Merge branch 'master' of https://github.com/MaurerThomas/Project56