Add rules
Fix variable name
Merge branch 'dev'