Changes made by Rafael Alves (ralves.sql@gmail.com).