Bug/6

This should fix the problem (it has a little urgency) but needs more testing.
Prefer double-quoted strings unless you need single quotes to avoid extra backslashes for escaping.