Modified Makefile to work on Windows and Mac