Changed makefile and numeric header file