merge chapter 5 development into master

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