Add timeout
Merge pull request #1 from cat2608/patch-1

Add timeout