android stuff
Merge pull request #4 from jamur2/master

android stuff