Merge branch 'issue_137' into cooking