add new rules and tests
Merge pull request #345 from mimmi20/issue-343

Fixes #343