CSV-entries with both a comma and a quote

I've got a grid up and running which presents data from a CSV-file using AW.CSV.Table. Trouble occurs when one of my entries contain both a single quote and a comma, any tricks as to how I should go on to make this come out correctly in a single cell?

I'm encapsulating each of the entries with quotes in order to deal with the ones containing commas, but have no idea as to how to deal with both. I've tried placing an escape character in front of the quote (inside the entry), but it didn't seem to help any.

I've also tried replacing the quote with & quot; which looks fine, but turns nasty when I enter edit-mode on the particular cell.

How silly of me, the spec-article for CSV at wikipedia (http://en.wikipedia.org/wiki/Comma-separated_values) suggests double quotes on such occations. Just had a go and it seemes fine now! :)