Include `ack_answer` in `wait_for_answer`

and update documentation