Merge branch 'issue_90' into cooking