Changes made by Rodrigo Albuquerque (albukars2@gmail.com).