                 callback(weatherDataItems?[0], error)
             }
         } else {
-            let location = "\(locationItem.name),\(locationItem.isoCountryCode)"
+            let location = "\(locationItem.name)" //,\(locationItem.isoCountryCode)"
             self.communicator.currentWeatherForLocation(location) {(json, error) in
                 var weatherDataItem: WeatherDataItem?
                 if let json = json {

    func forecastForCurrentLocation(callback: ([WeatherDataItem]?, NSError?) -> Void) {
        self.currentLocation {(placemark, error) in
            if let placemark = placemark {
                let location = "\(placemark.locality),\(placemark.ISOcountryCode)"
                self.communicator.dailyForecastWeatherForLocation(location, forDays: self.numberOfForecastedDays) {(json, error) in
                    var weatherDataItems: [WeatherDataItem] = []
                    if let json = json {

        }
    }
    
    func weatherForCurrentLocation(callback: (WeatherDataItem?, NSError?) -> Void) {
        self.currentLocation {(placemark, error) in
            if let placemark = placemark {
                let location = "\(placemark.locality)" //,\(placemark.ISOcountryCode)"
                self.communicator.currentWeatherForLocation(location) {(json, error) in
                    var weatherDataItem: WeatherDataItem?
                    if let json = json {
