Added .NET 4.0 support