Fixed MSVC build

 - merged from my CppSkeleton project