Some final adjustments so examinations match
Merge remote-tracking branch 'origin/master'