Bring Karel Up-to-Date

Need to wait till Ellen's PR to be accepted.