Update makefile
Merge branch 'setup'