Improved the make file