Merge branch 'jc/makefile'