Added support for .NET 4.0