update

some updated, android issues should be resolved. Merge with original repo to avoid conflicts.