Modified Makefile and bibliography