first draft
Merge pull request #30 from yanick/week-105

first draft