Updated to run on .NET 3.5 Framework