Bug fix for Emergency Stop
Merge pull request #475 from Salandora/master

Bug fix for Emergency Stop