Updated for Visual Studio 2012