Add --wait option and allow goal canceling (Ctrl-C)