added timeout
Merge pull request #40 from Rleahy22/timeout

added timeout