Merge branches 'issue_87', 'issue_91' and 'issue_92' into cooking