changes to get FMU working in Visual Studio
Changes for Visual Studio version
Merge remote-tracking branch 'origin/master'