Updated solution to Visual Studio 2012