added timeout
Merge pull request #5 from michaelwittig/master

Timeout added