Updated to VS2010 Compatible