Hack for single quotes inside names
Merge pull request #700 from psav/fix_quote

Let the record show that this isn't actually a hack...