aligned with solutions branch
Merge branch 'lessonc-tobias'