add new rules, a test and a new android
fix device name
fix version information
Merge pull request #344 from mimmi20/issue-340

Fixes #340