 		if let location = location {
 			// present initial location if any
 			self.location = location
-			showCoordinates(location.coordinate)
-		}
-	}
-	
-	public override func viewWillDisappear(animated: Bool) {
-		super.viewWillDisappear(animated)
-		
-		if isMovingFromParentViewController() || isBeingDismissed() {
-			completion?(location)
+			showCoordinates(location.coordinate, animated: false)
 		}
 	}
 	


extension LocationPickerViewController: MKMapViewDelegate {
	public func mapView(mapView: MKMapView!, viewForAnnotation annotation: MKAnnotation!) -> MKAnnotationView! {
		let pin = MKPinAnnotationView(annotation: annotation, reuseIdentifier: "annotation")
		pin.pinColor = .Green
		pin.animatesDrop = true
		pin.canShowCallout = true
		return pin
	}
	
	public func mapView(mapView: MKMapView!, didAddAnnotationViews views: [AnyObject]!) {
		if let annotations = mapView.annotations {
			assert(annotations.count == 1, "Only one annotation should be on map at a time")
		}
	}
}

	}
	
	func updateAnnotation() {
		if let annotations = mapView.annotations {
			mapView.removeAnnotations(annotations)
		}
		if let location = location {
			mapView.addAnnotation(location)
			mapView.selectAnnotation(location, animated: true)
		}
	}
	
