Update ingredient list
Merge master