Updated to use VS2012