Updated solution to VS2012