re-introducing timeout. Closes #34