Formalism property: Correct a mistake + Add CD, U=>CA demonstration
Merge remote-tracking branch 'upstream/master'