android main
Merge pull request #2 from mtabor150/twfandroid

android main