Upgraded to vs2013 solution