Adding windows changes after ubuntu changes
Merge branch 'master' of github.com:roxanadiacenco/testGit