FIX: errors in exo 45.
Merge remote-tracking branch 'upstream/master'