fix
Merge branch 'micke_dev' of https://github.com/smyyy/COM2Android.git into micke_dev