Merge pull request #1 from aporter/master

Updates to android source code