issue 111
Merge pull request #34 from yanick/week-111

issue 111