Modify C++ 11 to be MS-friendly #19