Updated C# project as per comments