Updating Linux builds & Makefile
Updating OSX & Windows builds