Updated the solution to Vs2013