copied fixes to week 02 for resubmission
Merge branch 'master' into gh-pages