Added support for MSVC