What is a good reference book for English idioms?

Can anyone recommend a comprehensive reference book for English idioms? I’m looking for something with meanings as well as origins that ranges from the common to the obscure. I am a native English speaker, so this is for my own personal interest rather than for the purpose of learning the language.

Alternatively, recommendations for a less comprehensive but good/interesting reference source (i.e. something similar to Bill Bryson’s “Dictionary of Troublesome Words”) or a book about the history of idioms generally would also be welcome.