Merge pull request #2 from nickgrifka/master

Getting Android Base
Merge pull request #2 from abist/master

Merge pull request #2 from nickgrifka/master