add new rules and test
Merge pull request #440 from mimmi20/issue-437

Fixes #437