Updated to MSVC 2013