Fuel

merge fuel into master