Fixed MSBuild script
Merge branch 'develop'