Correction for calling the stop function.
Merge remote-tracking branch 'origin/decouple_dynamics' into toy_dynamics