Updated for Microsoft Visual Studio 2010