Merge pull request #169 from amikheychik/master

Feature 121: optimization of @extend
Switch to shorter rule_config name style.
Merge pull request #170 from bendiy/master

Switch to shorter rule_config name style.
Cleanup from using @extend
Code-style fixed