adding more escaping
Merge pull request #23 from zbtirrell/vip-review

adding more escaping