Updated from week 3
Merge pull request #10 from lpoulain/patch-2

Updated from week 3