Yamaha and Fiat to continue together for two more years