incorporated changed to build on windows