add new rules and a test
Merge pull request #466 from mimmi20/issue-459

Fixes #459