add a timeout param to the answer function
Merge branch 'answer-test'

* answer-test:
  add a timeout param to the answer function