Minor Makefile changes. The makefile is now the same as the one uploaded on the forum.