Changes made by Carlos Garcia (cron@outlook.com).