[Florian Kummer] Updating Windows Port