and a few final entries
Merge pull request #22 from yanick/week-95

and a few final entries