Adjusted Makefile for new version of makefile collection
Recompiled Windows binaries