Updated solution to vs2012.