updating to work for VS2010
fixed linux build, now builds in VS2010