Made compatiable with .Net 4 and Visual Studio 2010