some earlier changes made at epfl on windows
merged windows branch back