Minor modifs
Merge branch 'work_srozen' of https://github.com/yrmt/OS into work_srozen
Report continued
Merge branch 'master' into work_srozen