Merge pull request #2498 from flx42/cpp_classification_example