add new rules and tests
fix version information
fix tests
fix tests
Merge pull request #347 from mimmi20/issue-342

Fixes #342