Cooking update: issue 87, 91
Merge branch 'cooking' into production