Cleaned up Makefile. Tested on different Windows machine.