Fixed process termination
Merge branch 'master' into ba