Merge "Move examples from Addendum to Setting Up chapter"