MSVC 2013 compatibility finished