Updates
Updated C# version, not tested
Merge branch 'dev'