Merge pull request #507 from mimmi20/issue-500

Fixes #500
Merge pull request #510 from mimmi20/issue-506

Fixes #506
Merge pull request #512 from mimmi20/issue-511

Fixes #511
Merge branch 'master' of https://github.com/browscap/browscap into test-with-refactoring