Moved Nicolas Charpentier's into c++/version_2/