add new rules, add test
chnge rules
Merge pull request #464 from mimmi20/issue-413

Fixes #413