An alternate Chapter 2
Chapter 3 added, following Chapter 2b
Merge branch 'master' into old-state