Two more examples, second attempt

same as PR #6, including all your requested changes.

To avoid adding whitespace-changing commits on top of the previous PR, here's a fresh branch with a cleaner history.