Added x64 and v120 support