Add option for task timeout

Next release...