Merge branch 'jn/make'