Working for Android
Android Done
merged
Android Done