more robust quoting/escaping
Merge pull request #3 from rjocoleman/master

Avoid delimiter collision