c and Makefile settings
Merge branch 'master' into work