Improvement of rules
Merge pull request #4 from parshikov/enhancement/rules

Improvement of rules