Issue 224: added rule and test
Issue 228: added rule and test
Merge pull request #231 from mimmi20/issue-224

Fixes #224 and fixes #228