Merge pull request #2 from juno5460/master

update android
refactor sth
Merge pull request #1 from yezhiming/master

update