Heavy and extra-heavy oil upgrading technologies /