Merge pull request #32 from yanick/week-108

very first draft
two last ones