Issue #174 - Modify android files