Adding stop functionality. see #44