Added support for .NET3.5