added rules and test
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
Merge pull request #383 from mimmi20/issue-382

Fixes #382
Next build 5032