iOS Module Pull Request

Done po. This is in MapViewController too so I updated MapViewController as well.