Changed the solution to be vs2010 compatible