Merge pull request #36 from yanick/week-117

117
and a last one