             
             self.streetNumber = component("street_number", inArray: addressComponents, ofType: "long_name")
             
+            self.locality = component("locality", inArray: addressComponents, ofType: "long_name")
+            self.postalCode = component("postal_code", inArray: addressComponents, ofType: "short_name")
+            
             self.route = component("route", inArray: addressComponents, ofType: "long_name")
             
-            self.locality = component("locality", inArray: addressComponents, ofType: "long_name")
+            
             
             self.subLocality = component("subLocality", inArray: addressComponents, ofType: "long_name")
             
             self.administrativeArea = component("administrative_area_level_1", inArray: addressComponents, ofType: "long_name")
             
-            self.postalCode = component("postal_code", inArray: addressComponents, ofType: "short_name")
+            
             
             self.country =  component("country", inArray: addressComponents, ofType: "long_name")
             

    
    
    
    func geocodeAddressString(#address:NSString, onGeocodingCompletionHandler:((address:NSDictionary?, error:String?)->Void)?){
        
        self.geocodingCompletionHandler = onGeocodingCompletionHandler
        

    }
    
    
    func geocodeUsingGoogleAddressString(#address:NSString, onGeocodingCompletionHandler:((geocodeInfo:NSDictionary?, error:String?)->Void)?){
        
        self.geocodingCompletionHandler = onGeocodingCompletionHandler
        
