The Makefile now works on both OSX and Linux