Android platform finished
Merge pull request #1 from dmeyer3691/master

Android platform finished