Who Killed Che Guevara?

According to text books Che Guevara was killed by troops during a battle in 1967. But there is also evidence that he was in fact captured and executed a day later than reported.