Updated to support Visual Studio 2013