#25 refactor: simplified timeouts
Merge pull request #131 from adamralph/25

#25 refactor: simplified timeouts