done with android!!!
Merge pull request #17 from dazhaoniel/master

done with android!!!