Merge pull request #6 from vasili-zolotov/rules

update detection rules
fix tests
simplify rules