Use wait() instead of wait_with_output()

Use wait() instead of wait_with_output() #118