Merge branches 'issue_88' and 'issue_90' into cooking