mpo_expected.cc is not needed
Changes to build with Visual Studio C++
Merged with master