fixed bugs for Android
Merge pull request #2 from YvonneYu/master

fixed bugs for Android