Added emergency stop button.
Resolved merge conflict.