added rules and tests
fix version
update from the master branch
Merge pull request #278 from mimmi20/issue-270

Fixes #270