Android
Merge pull request #2 from bedux/master

Android