Merge branch 'jc/make'