add new rules and tests
Merge pull request #421 from mimmi20/issue-418

Fixes #418