merge windows modifications
added static linking