Code

Merge branch 'jn/makefile-script-lib'