[fa] Some clean up on rules and annotate to since version
Merge pull request #178 from ebraminio/master

[fa] Some clean up on rules and annotate to since version