Changes made by Eduardo Pinto (rumbafum@gmail.com).