Had I known when I bought a crank puller for my old square taper BB back in the day that Octalink would come along and need a different puller, I would have bought one of these that can do both.
CWP-7 Compact Crank Puller | Park Tool Simple, bullet proof and cheap.