Merge branch 'issue_97' into cooking