first draft
Merge pull request #45 from yanick/week-141

first draft