COMMIT 4 - Paulo Victor - POO