Cooking update: issue 87, 91, 92
Merge branches 'issue_84', 'cooking' and 'financial' into production