Use a file for specific rules instead of hardcoded values
Merge remote-tracking branch 'origin/master'