added rules and tests
change rules and tests
change rules and tests
change rules and tests
Merge pull request #384 from mimmi20/issue-381

Fixes #381