Fix/makefile