A poll-and-wait option for the stop command.

For issue #300 - a low-hanging fruit :-)

@dpmatthews - please review.