NEW: Task 2 from assignment 1 and some minor changes to the android code