Changes made by Andre Almeida (andremoreiradealmeida@gmail.com).