Changed oil

Merging master and different-oil branch
Miss spelled "canola".