Merge branch 'jn/makefile'