10 Commits (fix_#248)