last-minute additions
Merge pull request #46 from yanick/week-141

last-minute additions