upgraded for VS2013
merge with 2013