Fixing Makefile for MacOSX and Linux