Upgraded the solution for Visual Studio 2013