forgot to save file before checkin
Merge pull request #4 from renepickhardt/master

Small edits for timeouts