Merge pull request #285 from mimmi20/issue-255

Issues #255 and #256
Merge branch 'master' of https://github.com/browscap/browscap into issue-3