added new rules and unit tests
changed rule
Merge pull request #123 from mimmi20/issue-120

Fixes #120
update from the master branch