Merge branch 'new_rules', remote-tracking branch 'origin/new_rules' into new_rules
fixing typos