Merge branch 'fc/makefile'