Merge branch 'issue_158' into cooking