Merge branch 'issue_177' into cooking