Fuel and EnergyClass
Merge remote-tracking branch 'origin/Heider'