Continue fix: Do the isAlive check at the right place
Merge branch 'master' into lab3_submission