added functionality to the stop button
Merge commit 'HEAD@{1}'