small fixes
Merge branch 'pr/5'
Using new Andorid