Merge Teste on Github for Windows - Commit 2