Update rules to prevent collisions
Merge master
Fix build
Merge pull request #168 from 28msec/rule-collision

Update rules to prevent collisions