Updated to MSVS 2013