Separated static Rule Creation logic from Rule class.
Merge remote-tracking branch 'origin/master'