Merging develop to master

Prefer double-quoted strings unless you need single quotes to avoid extra backslashes for escaping.