11 Commits (fix_#248)