Added a configuration file and updated the makefile