Crash check added...
Merge branch 'master' into feature/appman