Added Visual Studio compatibiliy