Merge branch 'clean_and_improve_numeric_examples' into 'master'