Ensure the app is really running before killing it
Merge pull request #481 from elia/master

Ensure the app is really running before killing it