updated for 1.5 and VS2012