add new rules and test
Merge pull request #431 from mimmi20/issue-430

Fixes #430