Changes made by German Alvarez (kenchic@gmail.com).