Yes, just what I was going to suggest.
Taekwondo is really fun to learn, while getting you very fit. It's not as brutal as other martial arts (like Muay Thai or Eskrima) but you learn some brutal kicks and punches.
My friend does Taekwondo and after around... two weeks he could kick my head :o