Adding first changes to be able to compile on windows, this are not the last changes at all