Update code to work with Visual Studio 2013