Updated to use VS2013