fixed core project
Merge branch 'windows'