问题补充：
He told me his computer company was in great need of a capable leader, with strong will as well as good humor.
A. who
B. that
C. one
D. which
答案：
A. who
B. that
(答案→)C. one
D. which
解析：根据句意：他告诉我的的公司急需要一个有能力的领导，一个有着坚强的意志以及幽默感的人。逗号后由with构成的介词短语，并非是一个句子，所以排除A,B,D.选C。 one = a capable leader
