Final check-in of solution

Final check-in of solution, tested with .NET 4.5 with Visual C# Express
2010.