New rules, improved old rules.
Merge branch 'master' of https://github.com/PeterisP/morphology