Better detection of Android Version; Simplified regex
Merge pull request #360 from commenthol/osandroid

Better detection of Android Version; Simplified regex