Switch stop to use a channel, fixes #20