Modify chili recipe
merge master and origin/master