final commit for the SMP2 project
Merge remote-tracking branch 'origin/master'