#878 change join and stop to be asynchronous

#878