Updated to VS2010 Comptatible