timeouts work better now
Merge pull request #37 from tabascoeye/master

timeouts work better now. closes #36