Fixes issue with stop command not reporting done, close #25