#526: add new rules and tests
#526: fix tests
#526: fix test
#529: add new tests
#529: add rules, change tests
Merge pull request #530 from mimmi20/issue-529

Fixes #529
Merge pull request #528 from mimmi20/issue-525

Fixes #525
Merge pull request #527 from mimmi20/issue-326

Fixes #526
Merge branch 'master' of https://github.com/browscap/browscap