Modified configuration file and makefile.