Merge pull request #5 from khawkins/master

Latest Android code to plugin