Merge branches 'issue_90' and 'issue_88' into cooking