issue_67: cooking fixes
Merge branch 'issue_67' into production