Repository: porimol/countryinfo (language: python)

Issue:
Macau missing key 'capital_latlng'
I run into a key error while try to access capital_latlng from Macau. 

`CountryInfo('Macau').info()['capital_latlng']`

Despite that there no capital city exist, a nan or empty string as return value, would be preferred..
missing and incorrect entries
Correctly making pull request from dev branch instead of master branch


Discussion / hints:

Fix patch:
diff --git a/countryinfo/data/andorra.json b/countryinfo/data/andorra.json
index 3560f8d..fc1a59d 100644
--- a/countryinfo/data/andorra.json
+++ b/countryinfo/data/andorra.json
@@ -1,57 +1,26 @@
-{
-  "ISO": {
-    "alpha2": "AD",
-    "alpha3": "AND"
-  },
-  "name": "Andorra",
-  "altSpellings": [
-    "AD",
-    "AND",
-    "Principality of Andorra"
-  ],
-  "area": 467.63,
-  "border": [
-    "FRA",
-    "ESP"
-  ],
-  "callingCodes": [
-    "376"
-  ],
-  "capital": "Andorra la Vella",
-  "capital_latlng": [
-    42.5,
-    1.516667
-  ],
-  "currencies": [
-    "EUR"
-  ],
-  "demonym": "Andorran",
-  "flag": "",
-  "languages": [
-    "ca"
-  ],
-  "latlng": [
-    42.5,
-    1.516667
-  ],
-  "nativeName": "Andorra",
-  "population": 77543,
-  "provinces": [],
-  "region": "Europe",
-  "subregion": "Southern Europe",
-  "timezones": [
-    "UTC+01:00"
-  ],
-  "tld": [
-    ".ad"
-  ],
-  "wiki": "https://en.wikipedia.org/wiki/Andorra",
-  "translations": {
-    "de": "Andorra",
-    "es": "Andorra",
-    "fr": "Andorre",
-    "ja": "\u30a2\u30f3\u30c9\u30e9",
-    "it": "Andorra"
-  },
-  "intermediateregion": ""
-}
\ No newline at end of file
+{"name":"Andorra",
+  "altSpellings":["AD","Principality of Andorra","Principat d'Andorra"],
+  "area":467,
+  "borders":["FRA","ESP"],
+  "callingCodes":["376"],
+  "capital":"Andorra la Vella",
+  "capital_latlng":[42.5,1.5],
+  "currencies":["EUR"],
+  "demonym":"Andorran",
+  "flag":"https://upload.wikimedia.org/wikipedia/commons/1/19/Flag_of_Andorra.svg",
+  "geoJSON":{"type":"FeatureCollection",
+    "features":[{"type":"Feature","id":"AND",
+      "properties":{"name":"Andorra"},
+      "geometry":{"type":"Polygon",
+        "coordinates":[[[1.3943348412536523,42.64693108863298 ],[1.3943348412536523,42.40519111504224 ],[1.865862744691583,42.40519111504224 ],[1.865862744691583,42.64693108863298],[1.3943348412536523,42.64693108863298]]]}}]},
+  "ISO":{"alpha2":"AD","alpha3":"AND"},
+  "languages":["ca","fr","es","oc"],
+  "latlng":[42.5,1.5],
+  "nativeName":"Principat d'Andorra",
+  "population":81588,
+  "provinces":["Andorra la Vella","Canillo","Encamp","Escaldes-Engordany","La Massana","Ordino","Sant Julià de Lòria"],
+  "region":"Europe","subregion":"Southern Europe",
+  "timezones":["UTC+01:00"],
+  "tld":[".ad"],
+  "translations":{"de":"Andorra","es":"Andorra","fr":"Andorre","ja":"アンドラ","it":"Andorra"},
+  "wiki":"https://en.wikipedia.org/wiki/Andorra"}
diff --git a/countryinfo/data/czeck_republic.json b/countryinfo/data/czeck_republic.json
index 6b2e473..09a27ee 100644
--- a/countryinfo/data/czeck_republic.json
+++ b/countryinfo/data/czeck_republic.json
@@ -1,236 +1,1 @@
-{
-  "name": "Czech Republic",
-  "altSpellings": [
-    "CZ",
-    "\u010cesk\u00e1 republika",
-    "\u010cesko",
-    "CZE",
-    "Czechia"
-  ],
-  "area": 78865,
-  "borders": [
-    "AUT",
-    "DEU",
-    "POL",
-    "SVK"
-  ],
-  "callingCodes": [
-    "420"
-  ],
-  "capital": "Prague",
-  "capital_latlng": [
-    50.087465,
-    14.421254
-  ],
-  "currencies": [
-    "CZK"
-  ],
-  "demonym": "Czech",
-  "flag": "",
-  "geoJSON": {
-    "type": "FeatureCollection",
-    "features": [
-      {
-        "type": "Feature",
-        "id": "CZE",
-        "properties": {
-          "name": "Czech Republic"
-        },
-        "geometry": {
-          "type": "Polygon",
-          "coordinates": [
-            [
-              [
-                16.960288,
-                48.596982
-              ],
-              [
-                16.499283,
-                48.785808
-              ],
-              [
-                16.029647,
-                48.733899
-              ],
-              [
-                15.253416,
-                49.039074
-              ],
-              [
-                14.901447,
-                48.964402
-              ],
-              [
-                14.338898,
-                48.555305
-              ],
-              [
-                13.595946,
-                48.877172
-              ],
-              [
-                13.031329,
-                49.307068
-              ],
-              [
-                12.521024,
-                49.547415
-              ],
-              [
-                12.415191,
-                49.969121
-              ],
-              [
-                12.240111,
-                50.266338
-              ],
-              [
-                12.966837,
-                50.484076
-              ],
-              [
-                13.338132,
-                50.733234
-              ],
-              [
-                14.056228,
-                50.926918
-              ],
-              [
-                14.307013,
-                51.117268
-              ],
-              [
-                14.570718,
-                51.002339
-              ],
-              [
-                15.016996,
-                51.106674
-              ],
-              [
-                15.490972,
-                50.78473
-              ],
-              [
-                16.238627,
-                50.697733
-              ],
-              [
-                16.176253,
-                50.422607
-              ],
-              [
-                16.719476,
-                50.215747
-              ],
-              [
-                16.868769,
-                50.473974
-              ],
-              [
-                17.554567,
-                50.362146
-              ],
-              [
-                17.649445,
-                50.049038
-              ],
-              [
-                18.392914,
-                49.988629
-              ],
-              [
-                18.853144,
-                49.49623
-              ],
-              [
-                18.554971,
-                49.495015
-              ],
-              [
-                18.399994,
-                49.315001
-              ],
-              [
-                18.170498,
-                49.271515
-              ],
-              [
-                18.104973,
-                49.043983
-              ],
-              [
-                17.913512,
-                48.996493
-              ],
-              [
-                17.886485,
-                48.903475
-              ],
-              [
-                17.545007,
-                48.800019
-              ],
-              [
-                17.101985,
-                48.816969
-              ],
-              [
-                16.960288,
-                48.596982
-              ]
-            ]
-          ]
-        }
-      }
-    ]
-  },
-  "ISO": {
-    "alpha2": "CZ",
-    "alpha3": "CZE"
-  },
-  "languages": [
-    "cs",
-    "sk"
-  ],
-  "latlng": [
-    49.75,
-    15.5
-  ],
-  "nativeName": "\u010cesk\u00e1 republika",
-  "population": 10521600,
-  "provinces": [
-    "Brnensky",
-    "Budejovicky",
-    "Jihlavsky",
-    "Karlovarsky",
-    "Kralovehradecky",
-    "Liberecky",
-    "Olomoucky",
-    "Ostravsky",
-    "Pardubicky",
-    "Plzensky",
-    "Praha",
-    "Stredocesky",
-    "Ustecky",
-    "Zlinsky"
-  ],
-  "region": "Europe",
-  "subregion": "Eastern Europe",
-  "timezones": [
-    "UTC+01:00"
-  ],
-  "tld": [
-    ".cz"
-  ],
-  "translations": {
-    "de": "Tschechische Republik",
-    "es": "Rep\u00fablica Checa",
-    "fr": "R\u00e9publique tch\u00e8que",
-    "ja": "\u30c1\u30a7\u30b3",
-    "it": "Repubblica Ceca"
-  },
-  "wiki": "http://en.wikipedia.org/wiki/czeck_republic",
-  "intermediateregion": ""
-}
\ No newline at end of file
+{"name":"Czech Republic","altSpellings":["CZ","Česká republika","Česko","Czechia"],"area":78865,"borders":["AUT","DEU","POL","SVK"],"callingCodes":["420"],"capital":"Prague","capital_latlng":[50.087465,14.421254],"currencies":["CZK"],"demonym":"Czech","flag":"","geoJSON":{"type":"FeatureCollection","features":[{"type":"Feature","id":"CZE","properties":{"name":"Czech Republic"},"geometry":{"type":"Polygon","coordinates":[[[16.960288,48.596982],[16.499283,48.785808],[16.029647,48.733899],[15.253416,49.039074],[14.901447,48.964402],[14.338898,48.555305],[13.595946,48.877172],[13.031329,49.307068],[12.521024,49.547415],[12.415191,49.969121],[12.240111,50.266338],[12.966837,50.484076],[13.338132,50.733234],[14.056228,50.926918],[14.307013,51.117268],[14.570718,51.002339],[15.016996,51.106674],[15.490972,50.78473],[16.238627,50.697733],[16.176253,50.422607],[16.719476,50.215747],[16.868769,50.473974],[17.554567,50.362146],[17.649445,50.049038],[18.392914,49.988629],[18.853144,49.49623],[18.554971,49.495015],[18.399994,49.315001],[18.170498,49.271515],[18.104973,49.043983],[17.913512,48.996493],[17.886485,48.903475],[17.545007,48.800019],[17.101985,48.816969],[16.960288,48.596982]]]}}]},"ISO":{"alpha2":"CZ","alpha3":"CZE"},"languages":["cs","sk"],"latlng":[49.75,15.5],"nativeName":"Česká republika","population":10521600,"provinces":["Brnensky","Budejovicky","Jihlavsky","Karlovarsky","Kralovehradecky","Liberecky","Olomoucky","Ostravsky","Pardubicky","Plzensky","Praha","Stredocesky","Ustecky","Zlinsky"],"region":"Europe","subregion":"Eastern Europe","timezones":["UTC+01:00"],"tld":[".cz"],"translations":{"de":"Tschechische Republik","es":"República Checa","fr":"République tchèque","ja":"チェコ","it":"Repubblica Ceca"},"wiki":"http://en.wikipedia.org/wiki/czeck_republic"}
diff --git a/countryinfo/data/tobago.json b/countryinfo/data/east_timor.json
similarity index 100%
rename from countryinfo/data/tobago.json
rename to countryinfo/data/east_timor.json
diff --git a/countryinfo/data/heard_island_and_mc_donald_islands.json b/countryinfo/data/heard_island_and_mc_donald_islands.json
index 03db1aa..74ba8b0 100644
--- a/countryinfo/data/heard_island_and_mc_donald_islands.json
+++ b/countryinfo/data/heard_island_and_mc_donald_islands.json
@@ -1,52 +1,1 @@
-{
-  "capital": "",
-  "capital_latlng": null,
-  "name": "Heard Island and McDonald Islands",
-  "altSpellings": [
-    "HM",
-    "HMD"
-  ],
-  "area": 412,
-  "borders": [],
-  "callingCodes": [
-    ""
-  ],
-  "currencies": [
-    "AUD"
-  ],
-  "demonym": "Heard and McDonald Islander",
-  "flag": "",
-  "geoJSON": {},
-  "ISO": {
-    "alpha2": "HM",
-    "alpha3": "HMD"
-  },
-  "languages": [
-    "en"
-  ],
-  "latlng": [
-    -53.1,
-    72.51666666
-  ],
-  "nativeName": "Heard Island and McDonald Islands",
-  "population": 0,
-  "provinces": [
-    "Heard Island and McDonald Islands"
-  ],
-  "region": "Oceania",
-  "subregion": "Australia and New Zealand",
-  "timezones": null,
-  "tld": [
-    ".hm",
-    ".aq"
-  ],
-  "translations": {
-    "de": "Heard und die McDonaldinseln",
-    "es": "Islas Heard y McDonald",
-    "fr": "\u00celes Heard-et-MacDonald",
-    "ja": "\u30cf\u30fc\u30c9\u5cf6\u3068\u30de\u30af\u30c9\u30ca\u30eb\u30c9\u8af8\u5cf6",
-    "it": "Isole Heard e McDonald"
-  },
-  "wiki": "http://en.wikipedia.org/wiki/heard_island_and_mc_donald_islands",
-  "intermediateregion": ""
-}
\ No newline at end of file
+{"name":"Heard Island and McDonald Islands","altSpellings":["HM"],"area":412,"borders":[],"callingCodes":[""],"capital":"","capital_latlng":[],"currencies":["AUD"],"demonym":"Heard and McDonald Islander","flag":"","geoJSON":{},"ISO":{"alpha2":"HM","alpha3":"HMD"},"languages":["en"],"latlng":[-53.1,72.51666666],"nativeName":"Heard Island and McDonald Islands","population":0,"provinces":["Heard Island and McDonald Islands"],"region":"","subregion":"","timezones":null,"tld":[".hm",".aq"],"translations":{"de":"Heard und die McDonaldinseln","es":"Islas Heard y McDonald","fr":"Îles Heard-et-MacDonald","ja":"ハード島とマクドナルド諸島","it":"Isole Heard e McDonald"},"wiki":"http://en.wikipedia.org/wiki/heard_island_and_mc_donald_islands"}
diff --git a/countryinfo/data/holy_see_vatican_city.json b/countryinfo/data/holy_see_vatican_city.json
new file mode 100644
index 0000000..b8b6c85
--- /dev/null
+++ b/countryinfo/data/holy_see_vatican_city.json
@@ -0,0 +1,26 @@
+{   
+    "name":"Vatican City State",
+    "alt":["Vatican City","Vatican","The Vatican"],
+    "area":0.49,
+    "borders":["IT"],
+    "callingCodes":["379"],
+    "capital":["Vatican City"],
+    "capital_latlng":[41.904755,12.454628],
+    "currencies":["EUR"],
+    "demonym":"Vaticanian",
+    "flag":"https://upload.wikimedia.org/wikipedia/commons/3/39/Flag_of_the_Vatican_City_%282023%E2%80%93present%29.svg",
+    "geoJSON":{},
+    "ISO":{
+        "alpha2":"VA",
+        "alpha3":"VAT"
+    },
+    "languages":["la","it"],
+    "latlng":[41.904755,12.454628],
+    "nativeName":"Vaticano",
+    "population":764,
+    "provinces":["Holy See (Vatican City)"],
+    "timezones":["UTC+01:00"],
+    "region":"Europe",
+    "subregion":"Southern Europe",
+    "tld":[".va"],
+    "wiki":"http://en.wikipedia.org/wiki/holy_see_vatican_city"}
\ No newline at end of file
diff --git a/countryinfo/data/hong_kong.json b/countryinfo/data/hong_kong.json
index b67be00..a7b077a 100644
--- a/countryinfo/data/hong_kong.json
+++ b/countryinfo/data/hong_kong.json
@@ -1,62 +1,1 @@
-{
-  "name": "Hong Kong",
-  "altSpellings": [
-    "HK",
-    "\u9999\u6e2f",
-    "HKG",
-    "Hong Kong Special Administrative Region of China",
-    "Homg Kong, China"
-  ],
-  "area": 1104,
-  "borders": [
-    "CHN"
-  ],
-  "callingCodes": [
-    "852"
-  ],
-  "capital": "City of Victoria",
-  "capital_latlng": [
-    22.396428,
-    114.109497
-  ],
-  "currencies": [
-    "HKD"
-  ],
-  "demonym": "Chinese",
-  "flag": "",
-  "geoJSON": {},
-  "ISO": {
-    "alpha2": "HK",
-    "alpha3": "HKG"
-  },
-  "languages": [
-    "en",
-    "zh"
-  ],
-  "latlng": [
-    22.25,
-    114.16666666
-  ],
-  "nativeName": "\u9999\u6e2f",
-  "population": 7234800,
-  "provinces": [
-    "Hong Kong"
-  ],
-  "region": "Asia",
-  "subregion": "Eastern Asia",
-  "timezones": [
-    "UTC+08:00"
-  ],
-  "tld": [
-    ".hk"
-  ],
-  "translations": {
-    "de": "Hong Kong",
-    "es": "Hong Kong",
-    "fr": "Hong Kong",
-    "ja": "\u9999\u6e2f",
-    "it": "Hong Kong"
-  },
-  "wiki": "http://en.wikipedia.org/wiki/hong_kong",
-  "intermediateregion": ""
-}
\ No newline at end of file
+{"name":"Hong Kong","altSpellings":["HK","香港"],"area":1104,"borders":["CHN"],"callingCodes":["852"],"capital":"City of Victoria","capital_latlng":[22.278333,114.174444],"currencies":["HKD"],"demonym":"Chinese","flag":"","geoJSON":{},"ISO":{"alpha2":"HK","alpha3":"HKG"},"languages":["en","zh"],"latlng":[22.25,114.16666666],"nativeName":"香港","population":7234800,"provinces":["Hong Kong"],"region":"Asia","subregion":"Eastern Asia","timezones":["UTC+08:00"],"tld":[".hk"],"translations":{"de":"Hong Kong","es":"Hong Kong","fr":"Hong Kong","ja":"香港","it":"Hong Kong"},"wiki":"http://en.wikipedia.org/wiki/hong_kong"}
diff --git a/countryinfo/data/hungary.json b/countryinfo/data/hungary.json
index d5868d9..413fe82 100644
--- a/countryinfo/data/hungary.json
+++ b/countryinfo/data/hungary.json
@@ -1,245 +1,25 @@
 {
-  "name": "Hungary",
-  "altSpellings": [
-    "HU",
-    "HUN"
-  ],
-  "area": 93028,
-  "borders": [
-    "AUT",
-    "HRV",
-    "ROU",
-    "SRB",
-    "SVK",
-    "SVN",
-    "UKR"
-  ],
-  "callingCodes": [
-    "36"
-  ],
-  "capital": "Budapest",
-  "capital_latlng": [
-    47.498382,
-    19.040471
-  ],
-  "currencies": [
-    "HUF"
-  ],
-  "demonym": "Hungarian",
-  "flag": "",
-  "geoJSON": {
-    "type": "FeatureCollection",
-    "features": [
-      {
-        "type": "Feature",
-        "id": "HUN",
-        "properties": {
-          "name": "Hungary"
-        },
-        "geometry": {
-          "type": "Polygon",
-          "coordinates": [
-            [
-              [
-                16.202298,
-                46.852386
-              ],
-              [
-                16.534268,
-                47.496171
-              ],
-              [
-                16.340584,
-                47.712902
-              ],
-              [
-                16.903754,
-                47.714866
-              ],
-              [
-                16.979667,
-                48.123497
-              ],
-              [
-                17.488473,
-                47.867466
-              ],
-              [
-                17.857133,
-                47.758429
-              ],
-              [
-                18.696513,
-                47.880954
-              ],
-              [
-                18.777025,
-                48.081768
-              ],
-              [
-                19.174365,
-                48.111379
-              ],
-              [
-                19.661364,
-                48.266615
-              ],
-              [
-                19.769471,
-                48.202691
-              ],
-              [
-                20.239054,
-                48.327567
-              ],
-              [
-                20.473562,
-                48.56285
-              ],
-              [
-                20.801294,
-                48.623854
-              ],
-              [
-                21.872236,
-                48.319971
-              ],
-              [
-                22.085608,
-                48.422264
-              ],
-              [
-                22.64082,
-                48.15024
-              ],
-              [
-                22.710531,
-                47.882194
-              ],
-              [
-                22.099768,
-                47.672439
-              ],
-              [
-                21.626515,
-                46.994238
-              ],
-              [
-                21.021952,
-                46.316088
-              ],
-              [
-                20.220192,
-                46.127469
-              ],
-              [
-                19.596045,
-                46.17173
-              ],
-              [
-                18.829838,
-                45.908878
-              ],
-              [
-                18.456062,
-                45.759481
-              ],
-              [
-                17.630066,
-                45.951769
-              ],
-              [
-                16.882515,
-                46.380632
-              ],
-              [
-                16.564808,
-                46.503751
-              ],
-              [
-                16.370505,
-                46.841327
-              ],
-              [
-                16.202298,
-                46.852386
-              ]
-            ]
-          ]
-        }
-      }
-    ]
-  },
-  "ISO": {
-    "alpha2": "HU",
-    "alpha3": "HUN"
-  },
-  "languages": [
-    "hu"
-  ],
-  "latlng": [
-    47,
-    20
-  ],
-  "nativeName": "Magyarorsz\u00e1g",
-  "population": 9879000,
-  "provinces": [
-    "Bacs-Kiskun",
-    "Baranya",
-    "Bekes",
-    "Bekescsaba",
-    "Borsod-Abauj-Zemplen",
-    "Budapest",
-    "Csongrad",
-    "Debrecen",
-    "Dunaujvaros",
-    "Eger",
-    "Fejer",
-    "Gyor",
-    "Gyor-Moson-Sopron",
-    "Hajdu-Bihar",
-    "Heves",
-    "Hodmezovasarhely",
-    "Jasz-Nagykun-Szolnok",
-    "Kaposvar",
-    "Kecskemet",
-    "Komarom-Esztergom",
-    "Miskolc",
-    "Nagykanizsa",
-    "Nograd",
-    "Nyiregyhaza",
-    "Pecs",
-    "Pest",
-    "Somogy",
-    "Sopron",
-    "Szabolcs-Szatmar-Bereg",
-    "Szeged",
-    "Szekesfehervar",
-    "Szolnok",
-    "Szombathely",
-    "Tatabanya",
-    "Tolna",
-    "Vas",
-    "Veszprem",
-    "Veszprem",
-    "Zala",
-    "Zalaegerszeg"
-  ],
-  "region": "Europe",
-  "subregion": "Eastern Europe",
-  "timezones": [
-    "UTC+01:00"
-  ],
-  "tld": [
-    ".hu"
-  ],
-  "translations": {
-    "de": "Ungarn",
-    "es": "Hungr\u00eda",
-    "fr": "Hongrie",
-    "ja": "\u30cf\u30f3\u30ac\u30ea\u30fc",
-    "it": "Ungheria"
-  },
-  "wiki": "https://en.wikipedia.org/wiki/Hungary",
-  "intermediateregion": ""
-}
\ No newline at end of file
+    "name":"Hungary",
+    "altSpellings":["HU","Magyarorszag"],
+    "area":93030,
+    "borders":["AUT","HRV","ROU","SRB","SVK","SVN","UKR"],
+    "callingCodes":["36"],
+    "capital":"Budapest",
+    "capital_latlng":[47.5,19.083333],
+    "currencies":["HUF"],
+    "demonym":"Hungarian",
+    "flag":"https://upload.wikimedia.org/wikipedia/commons/c/c1/Flag_of_Hungary.svg",
+    "geoJSON":{},
+    "ISO":{"alpha2":"HU","alpha3":"HUN"},
+    "languages":["hu"],
+    "latlng":[47,20],
+    "nativeName":"Magyarorszag",
+    "population":9678000,
+    "provinces":["Bacs-Kiskun","Baranya","Bekes","Bekescsaba","Borsod-Abauj-Zemplen","Budapest","Csongrad","Debrecen","Dunaujvaros","Eger","Fejer","Gyor","Gyor-Moson-Sopron","Hajdu-Bihar","Heves","Hodmezovasarhely","Jasz-Nagykun-Szolnok","Kaposvar","Kecskemet","Komarom-Esztergom","Miskolc","Nagykanizsa","Nograd","Nyiregyhaza","Pecs","Pest","Somogy","Sopron","Szabolcs-Szatmar-Bereg","Szeged","Szekesfehervar","Szolnok","Szombathely","Tatabanya","Tolna","Vas","Veszprem","Veszprem","Zala","Zalaegerszeg"],
+    "region":"Europe",
+    "subregion":"Eastern Europe",
+    "timezones":["UTC+01:00"],
+    "tld":[".hu"],
+    "translations":{"de":"Ungarn","es":"Hungria","fr":"Hongrie","ja":"ハンガリー","it":"Ungheria"},
+    "wiki":"http://en.wikipedia.org/wiki/hungary"
+}
diff --git a/countryinfo/data/macau.json b/countryinfo/data/macau.json
index 650ba4c..0042542 100644
--- a/countryinfo/data/macau.json
+++ b/countryinfo/data/macau.json
@@ -1,69 +1,25 @@
-<<<<<<< HEAD
-{"name":"Macau","altSpellings":["MO","Macao","澳门","Macao Special Administrative Region of the People's Republic of China","中華人民共和國澳門特別行政區","Região Administrativa Especial de Macau da República Popular da China"],"area":30,"borders":["CHN"],"callingCodes":["853"],"capital":"","currencies":["MOP"],"demonym":"Chinese","flag":"","geoJSON":{},"ISO":{"alpha2":"MO","alpha3":"MAC"},"languages":["zh","pt"],"latlng":[22.16666666,113.55],"nativeName":"澳門","population":631000,"provinces":["Macau"],"region":"Asia","subregion":"Eastern Asia","timezones":["UTC+08:00"],"tld":[".mo"],"translations":{"de":"Macao","es":"Macao","fr":"Macao","ja":"マカオ","it":"Macao"},"wiki":"http://en.wikipedia.org/wiki/macau"}
-=======
 {
-  "name": "Macau",
-  "altSpellings": [
-    "MO",
-    "\u6fb3\u95e8",
-    "Macao Special Administrative Region of the People's Republic of China",
-    "\u4e2d\u83ef\u4eba\u6c11\u5171\u548c\u570b\u6fb3\u9580\u7279\u5225\u884c\u653f\u5340",
-    "Regi\u00e3o Administrativa Especial de Macau da Rep\u00fablica Popular da China",
-    "MAC",
-    "Macao",
-    "Macao Special Administrative Region of China"
-  ],
-  "area": 30,
-  "borders": [
-    "CHN"
-  ],
-  "callingCodes": [
-    "853"
-  ],
-  "capital": "Macau",
-  "capital_latlng": [
-    22.16564,
-    113.57582
-  ],
-  "currencies": [
-    "MOP"
-  ],
-  "demonym": "Chinese",
-  "flag": "",
-  "geoJSON": {},
-  "ISO": {
-    "alpha2": "MO",
-    "alpha3": "MAC"
-  },
-  "languages": [
-    "zh",
-    "pt"
-  ],
-  "latlng": [
-    22.16666666,
-    113.55
-  ],
-  "nativeName": "\u6fb3\u9580",
-  "population": 631000,
-  "provinces": [
-    "Macau"
-  ],
-  "region": "Asia",
-  "subregion": "Eastern Asia",
-  "timezones": [
-    "UTC+08:00"
-  ],
-  "tld": [
-    ".mo"
-  ],
-  "translations": {
-    "de": "Macao",
-    "es": "Macao",
-    "fr": "Macao",
-    "ja": "\u30de\u30ab\u30aa",
-    "it": "Macao"
-  },
-  "wiki": "http://en.wikipedia.org/wiki/macau",
-  "intermediateregion": ""
-}
->>>>>>> eaff00f42afda8f47756f69a041d9585509253a2
+    "name":"Macau",
+    "altSpellings":["MO","澳门","Macao Special Administrative Region of the People's Republic of China","中華人民共和國澳門特別行政區","Região Administrativa Especial de Macau da República Popular da China"],
+    "area":30,
+    "borders":["CHN"],
+    "callingCodes":["853"],
+    "capital":"",
+    "capital_latlng":[22.16666666,113.55],
+    "currencies":["MOP"],
+    "demonym":"Chinese",
+    "flag":"",
+    "geoJSON":{},
+    "ISO":{"alpha2":"MO","alpha3":"MAC"},
+    "languages":["zh","pt"],
+    "latlng":[22.16666666,113.55],
+    "nativeName":"澳門",
+    "population":631000,
+    "provinces":["Macau"],
+    "region":"Asia",
+    "subregion":"Eastern Asia",
+    "timezones":["UTC+08:00"],
+    "tld":[".mo"],
+    "translations":{"de":"Macao","es":"Macao","fr":"Macao","ja":"マカオ","it":"Macao"},
+    "wiki":"http://en.wikipedia.org/wiki/macau"
+}
\ No newline at end of file
diff --git a/countryinfo/data/macedonia_former_yugoslav_republic_of.json b/countryinfo/data/macedonia_former_yugoslav_republic_of.json
index 0eb4131..a509c57 100644
--- a/countryinfo/data/macedonia_former_yugoslav_republic_of.json
+++ b/countryinfo/data/macedonia_former_yugoslav_republic_of.json
@@ -1,276 +1,1 @@
-{
-  "name": "Republic of Macedonia",
-  "altSpellings": [
-    "MK",
-    "Republic of Macedonia",
-    "\u0420\u0435\u043f\u0443\u0431\u043b\u0438\u043a\u0430 \u041c\u0430\u043a\u0435\u0434\u043e\u043d\u0438\u0458\u0430",
-    "MKD",
-    "North Macedonia",
-    "Republic of North Macedonia",
-    "Macedonia",
-    "Macedonia, Replublic of"
-  ],
-  "area": 25713,
-  "borders": [
-    "ALB",
-    "BGR",
-    "GRC",
-    "KOS",
-    "SRB"
-  ],
-  "callingCodes": [
-    "389"
-  ],
-  "capital": "Skopje",
-  "capital_latlng": [
-    41.996092,
-    21.43165
-  ],
-  "currencies": [
-    "MKD"
-  ],
-  "demonym": "Macedonian",
-  "flag": "",
-  "geoJSON": {
-    "type": "FeatureCollection",
-    "features": [
-      {
-        "type": "Feature",
-        "id": "MKD",
-        "properties": {
-          "name": "Macedonia"
-        },
-        "geometry": {
-          "type": "Polygon",
-          "coordinates": [
-            [
-              [
-                20.59023,
-                41.85541
-              ],
-              [
-                20.71731,
-                41.84711
-              ],
-              [
-                20.76216,
-                42.05186
-              ],
-              [
-                21.3527,
-                42.2068
-              ],
-              [
-                21.576636,
-                42.245224
-              ],
-              [
-                21.91708,
-                42.30364
-              ],
-              [
-                22.380526,
-                42.32026
-              ],
-              [
-                22.881374,
-                41.999297
-              ],
-              [
-                22.952377,
-                41.337994
-              ],
-              [
-                22.76177,
-                41.3048
-              ],
-              [
-                22.597308,
-                41.130487
-              ],
-              [
-                22.055378,
-                41.149866
-              ],
-              [
-                21.674161,
-                40.931275
-              ],
-              [
-                21.02004,
-                40.842727
-              ],
-              [
-                20.60518,
-                41.08622
-              ],
-              [
-                20.46315,
-                41.51509
-              ],
-              [
-                20.59023,
-                41.85541
-              ]
-            ]
-          ]
-        }
-      }
-    ]
-  },
-  "ISO": {
-    "alpha2": "MK",
-    "alpha3": "MKD"
-  },
-  "languages": [
-    "mk"
-  ],
-  "latlng": [
-    41.83333333,
-    22
-  ],
-  "nativeName": "\u0421\u0435\u0432\u0435\u0440\u043d\u0430 \u041c\u0430\u043a\u0435\u0434\u043e\u043d\u0438\u0458\u0430",
-  "population": 2058539,
-  "provinces": [
-    "Aracinovo",
-    "Bac",
-    "Belcista",
-    "Berovo",
-    "Bistrica",
-    "Bitola",
-    "Blatec",
-    "Bogdanci",
-    "Bogomila",
-    "Bogovinje",
-    "Bosilovo",
-    "Brvenica",
-    "Cair (Skopje)",
-    "Capari",
-    "Caska",
-    "Cegrane",
-    "Centar (Skopje)",
-    "Centar Zupa",
-    "Cesinovo",
-    "Cucer-Sandevo",
-    "Debar",
-    "Delcevo",
-    "Delogozdi",
-    "Demir Hisar",
-    "Demir Kapija",
-    "Dobrusevo",
-    "Dolna Banjica",
-    "Dolneni",
-    "Dorce Petrov (Skopje)",
-    "Drugovo",
-    "Dzepciste",
-    "Gazi Baba (Skopje)",
-    "Gevgelija",
-    "Gostivar",
-    "Gradsko",
-    "Ilinden",
-    "Izvor",
-    "Jegunovce",
-    "Kamenjane",
-    "Karbinci",
-    "Karpos (Skopje)",
-    "Kavadarci",
-    "Kicevo",
-    "Kisela Voda (Skopje)",
-    "Klecevce",
-    "Kocani",
-    "Konce",
-    "Kondovo",
-    "Konopiste",
-    "Kosel",
-    "Kratovo",
-    "Kriva Palanka",
-    "Krivogastani",
-    "Krusevo",
-    "Kuklis",
-    "Kukurecani",
-    "Kumanovo",
-    "Labunista",
-    "Lipkovo",
-    "Lozovo",
-    "Lukovo",
-    "Makedonska Kamenica",
-    "Makedonski Brod",
-    "Mavrovi Anovi",
-    "Meseista",
-    "Miravci",
-    "Mogila",
-    "Murtino",
-    "Negotino",
-    "Negotino-Poloska",
-    "Novaci",
-    "Novo Selo",
-    "Oblesevo",
-    "Ohrid",
-    "Orasac",
-    "Orizari",
-    "Oslomej",
-    "Pehcevo",
-    "Petrovec",
-    "Plasnia",
-    "Podares",
-    "Prilep",
-    "Probistip",
-    "Radovis",
-    "Rankovce",
-    "Resen",
-    "Rosoman",
-    "Rostusa",
-    "Samokov",
-    "Saraj",
-    "Sipkovica",
-    "Sopiste",
-    "Sopotnika",
-    "Srbinovo",
-    "Star Dojran",
-    "Staravina",
-    "Staro Nagoricane",
-    "Stip",
-    "Struga",
-    "Strumica",
-    "Studenicani",
-    "Suto Orizari (Skopje)",
-    "Sveti Nikole",
-    "Tearce",
-    "Tetovo",
-    "Topolcani",
-    "Valandovo",
-    "Vasilevo",
-    "Veles",
-    "Velesta",
-    "Vevcani",
-    "Vinica",
-    "Vitoliste",
-    "Vranestica",
-    "Vrapciste",
-    "Vratnica",
-    "Vrutok",
-    "Zajas",
-    "Zelenikovo",
-    "Zileno",
-    "Zitose",
-    "Zletovo",
-    "Zrnovci"
-  ],
-  "region": "Europe",
-  "subregion": "Southern Europe",
-  "timezones": [
-    "UTC+01:00"
-  ],
-  "tld": [
-    ".mk"
-  ],
-  "translations": {
-    "de": "Nordmazedonien",
-    "es": "Macedonia del Norte",
-    "fr": "Mac\u00e9doine du Nord",
-    "ja": "\u5317\u30de\u30b1\u30c9\u30cb\u30a2",
-    "it": "Macedonia del Nord"
-  },
-  "wiki": "http://en.wikipedia.org/wiki/macedonia_former_yugoslav_republic_of",
-  "intermediateregion": ""
-}
\ No newline at end of file
+{"name":"Republic of Macedonia","altSpellings":["MK","Republic of Macedonia","North Macedonia","Република Македонија"],"area":25713,"borders":["ALB","BGR","GRC","KOS","SRB"],"callingCodes":["389"],"capital":"Skopje","capital_latlng":[41.996092,21.43165],"currencies":["MKD"],"demonym":"Macedonian","flag":"","geoJSON":{"type":"FeatureCollection","features":[{"type":"Feature","id":"MKD","properties":{"name":"Macedonia"},"geometry":{"type":"Polygon","coordinates":[[[20.59023,41.85541],[20.71731,41.84711],[20.76216,42.05186],[21.3527,42.2068],[21.576636,42.245224],[21.91708,42.30364],[22.380526,42.32026],[22.881374,41.999297],[22.952377,41.337994],[22.76177,41.3048],[22.597308,41.130487],[22.055378,41.149866],[21.674161,40.931275],[21.02004,40.842727],[20.60518,41.08622],[20.46315,41.51509],[20.59023,41.85541]]]}}]},"ISO":{"alpha2":"MK","alpha3":"MKD"},"languages":["mk"],"latlng":[41.83333333,22],"nativeName":"Македонија","population":2058539,"provinces":["Aracinovo","Bac","Belcista","Berovo","Bistrica","Bitola","Blatec","Bogdanci","Bogomila","Bogovinje","Bosilovo","Brvenica","Cair (Skopje)","Capari","Caska","Cegrane","Centar (Skopje)","Centar Zupa","Cesinovo","Cucer-Sandevo","Debar","Delcevo","Delogozdi","Demir Hisar","Demir Kapija","Dobrusevo","Dolna Banjica","Dolneni","Dorce Petrov (Skopje)","Drugovo","Dzepciste","Gazi Baba (Skopje)","Gevgelija","Gostivar","Gradsko","Ilinden","Izvor","Jegunovce","Kamenjane","Karbinci","Karpos (Skopje)","Kavadarci","Kicevo","Kisela Voda (Skopje)","Klecevce","Kocani","Konce","Kondovo","Konopiste","Kosel","Kratovo","Kriva Palanka","Krivogastani","Krusevo","Kuklis","Kukurecani","Kumanovo","Labunista","Lipkovo","Lozovo","Lukovo","Makedonska Kamenica","Makedonski Brod","Mavrovi Anovi","Meseista","Miravci","Mogila","Murtino","Negotino","Negotino-Poloska","Novaci","Novo Selo","Oblesevo","Ohrid","Orasac","Orizari","Oslomej","Pehcevo","Petrovec","Plasnia","Podares","Prilep","Probistip","Radovis","Rankovce","Resen","Rosoman","Rostusa","Samokov","Saraj","Sipkovica","Sopiste","Sopotnika","Srbinovo","Star Dojran","Staravina","Staro Nagoricane","Stip","Struga","Strumica","Studenicani","Suto Orizari (Skopje)","Sveti Nikole","Tearce","Tetovo","Topolcani","Valandovo","Vasilevo","Veles","Velesta","Vevcani","Vinica","Vitoliste","Vranestica","Vrapciste","Vratnica","Vrutok","Zajas","Zelenikovo","Zileno","Zitose","Zletovo","Zrnovci"],"region":"Europe","subregion":"Southern Europe","timezones":["UTC+01:00"],"tld":[".mk"],"translations":{"de":"Mazedonien","es":"Macedonia","fr":"Macédoine","ja":"マケドニア旧ユーゴスラビア共和国","it":"Macedonia"},"wiki":"http://en.wikipedia.org/wiki/macedonia_former_yugoslav_republic_of"}
diff --git a/countryinfo/data/montenegro.json b/countryinfo/data/montenegro.json
index 725e150..c3ee253 100644
--- a/countryinfo/data/montenegro.json
+++ b/countryinfo/data/montenegro.json
@@ -1,61 +1,22 @@
-{
-  "name": "Montenegro",
-  "altSpellings": [
-    "ME",
-    "Montenegro",
-    "Montenegrin",
-    "MNE"
-  ],
-  "area": 13812,
-  "borders": [
-    "SRB",
-    "ALB",
-    "XKX",
-    "BIH",
-    "HRV"
-  ],
-  "callingCodes": [
-    "382"
-  ],
-  "capital": "Podgorica",
-  "capital_latlng": [
-    42.783333,
-    19.466667
-  ],
-  "currencies": [
-    "EUR"
-  ],
-  "demonym": "Montenegrin",
-  "flag": "https://upload.wikimedia.org/wikipedia/commons/thumb/6/64/Flag_of_Montenegro.svg/960px-Flag_of_Montenegro.svg.png",
-  "ISO": {
-    "alpha2": "ME",
-    "alpha3": "MNE"
-  },
-  "languages": [
-    "cnr"
-  ],
-  "latlng": [
-    42.7044223,
-    19.3957785
-  ],
-  "nativeName": "Crna Gora / \u0426\u0440\u043d\u0430 \u0413\u043e\u0440\u0430",
-  "population": 621873,
-  "region": "Europe",
-  "subregion": "Southern Europe",
-  "timezones": [
-    "UTC+01:00"
-  ],
-  "tld": [
-    ".me"
-  ],
-  "translations": {
-    "it": "Montenegro",
-    "de": "Montenegro",
-    "es": "Montenegro",
-    "fr": "Mont\u00e9n\u00e9gro",
-    "ja": "\u30e2\u30f3\u30c6\u30cd\u30b0\u30ed",
-    "en": "Montenegrin"
-  },
-  "wiki": "https://en.wikipedia.org/wiki/Montenegro",
-  "intermediateregion": ""
-}
\ No newline at end of file
+{"name":"Montenegro",
+  "altSpellings":["ME","Montenegro", "Montenegrin"],
+  "area":13812,
+  "borders":["SRB", "ALB", "XKX", "BIH", "HRV"],
+  "callingCodes":["382"],
+  "capital":"Podgorica",
+  "capital_latlng":[42.783333, 19.466667],
+  "currencies":["EUR"],
+  "demonym":"Montenegrin",
+  "flag":"https://upload.wikimedia.org/wikipedia/commons/thumb/6/64/Flag_of_Montenegro.svg/960px-Flag_of_Montenegro.svg.png",
+  "ISO":{"alpha2":"ME","alpha3":"MNE"},
+  "languages":["cnr"],
+  "latlng":[42.7044223, 19.3957785],
+  "nativeName":"Crna Gora",
+  "population":621873,
+  "provinces":["Podgorica", "Nikšić", "Pljevlja", "Bijelo Polje", "Cetinje", "Bar", "Herceg Novi", "Berane", "Budva", "Ulcinj", "Tivat", "Kotor", "Danilovgrad", "Gusinje", "Petnjica", "Rožaje", "Šavnik", "Žabljak", "Kolašin", "Mojkovac", "Plav", "Andrijevica", "Plužine", "Šušan"],
+  "region":"Europe",
+  "subregion":"Eastern Europe",
+  "timezones":["UTC+01:00"],
+  "tld":[".me"],
+  "translations":{"it": "Montenegro", "de":"Montenegro","es":"Montenegro","fr":"Monténégro","ja":"モンテネグロ", "en":"Montenegrin"},
+  "wiki":"https://en.wikipedia.org/wiki/Montenegro"}
diff --git a/countryinfo/data/serbia.json b/countryinfo/data/serbia.json
index 7bd8a82..0751534 100644
--- a/countryinfo/data/serbia.json
+++ b/countryinfo/data/serbia.json
@@ -1,97 +1,22 @@
-{
-  "name": "Serbia",
-  "altSpellings": [
-    "RS",
-    "Srbija",
-    "Republic of Serbia",
-    "Republika Srbija",
-    "SRB"
-  ],
-  "area": 49037,
-  "borders": [
-    "HUN",
-    "ROU",
-    "BGR",
-    "MKD",
-    "HRV",
-    "BIH",
-    "MNE",
-    "ALB",
-    "XKX"
-  ],
-  "callingCodes": [
-    "381"
-  ],
-  "capital": "Belgrade",
-  "capital_latlng": [
-    44.817813,
-    20.456897
-  ],
-  "currencies": [
-    "RSD"
-  ],
-  "demonym": "Serbian",
-  "flag": "https://upload.wikimedia.org/wikipedia/commons/thumb/f/ff/Flag_of_Serbia.svg/1200px-Flag_of_Serbia.svg.png",
-  "ISO": {
-    "alpha2": "RS",
-    "alpha3": "SRB"
-  },
-  "languages": [
-    "rs"
-  ],
-  "latlng": [
-    44.1305021,
-    16.4284181
-  ],
-  "nativeName": "Srbija",
-  "population": 7186862,
-  "provinces": [
-    "Kolubara",
-    "Ma\u010dva",
-    "Moravica",
-    "Pomoravlje",
-    "Rasina",
-    "Ra\u0161ka",
-    "\u0160umadija",
-    "Zlatibor",
-    "Bor",
-    "Brani\u010devo",
-    "Jablanica",
-    "Ni\u0161ava",
-    "P\u010dinja",
-    "Pirot",
-    "Podunavlje",
-    "Toplica",
-    "Zaje\u010dar",
-    "Central Banat",
-    "North Ba\u010dka",
-    "North Banat",
-    "South Ba\u010dka",
-    "South Banat",
-    "Srem",
-    "West Ba\u010dka",
-    "Kosovo",
-    "Kosovo-Pomoravlje",
-    "Kosovska Mitrovica ",
-    "Pe\u0107",
-    "Prizren"
-  ],
-  "region": "Europe",
-  "subregion": "Southern Europe",
-  "timezones": [
-    "UTC+01:00",
-    "UTC+02:00"
-  ],
-  "tld": [
-    ".rs"
-  ],
-  "translations": {
-    "de": "Serbien",
-    "es": "Serbia",
-    "fr": "Serbie",
-    "ja": "\u30bb\u30eb\u30d3\u30a2",
-    "it": "Serbia"
-  },
-  "wiki": "http://en.wikipedia.org/wiki/serbia",
-  "intermediateregion": ""
-}
\ No newline at end of file
+{"name":"Serbia",
+  "altSpellings":["RS","Srbija","Republic of Serbia","Republika Srbija"],
+  "area":49037,
+  "borders":["HUN","ROU","BGR","MKD","HRV","BIH","MNE","ALB","XKX"],
+  "callingCodes":["381"],
+  "capital":"Belgrade",
+  "capital_latlng":[44.817813,20.456897],
+  "currencies":["RSD"],
+  "demonym":"Serbian",
+  "flag":"https://upload.wikimedia.org/wikipedia/commons/thumb/f/ff/Flag_of_Serbia.svg/1200px-Flag_of_Serbia.svg.png",
+  "ISO":{"alpha2":"RS","alpha3":"SRB"},
+  "languages":["rs"],
+  "latlng":[44.016521,21.005859],
+  "nativeName":"Srbija",
+  "population":7186862,
+  "provinces":["Kolubara","Mačva","Moravica","Pomoravlje","Rasina","Raška","Šumadija","Zlatibor","Bor","Braničevo","Jablanica","Nišava","Pčinja","Pirot","Podunavlje","Toplica","Zaječar","Central Banat","North Bačka","North Banat","South Bačka","South Banat","Srem","West Bačka","Kosovo","Kosovo-Pomoravlje","Kosovska Mitrovica ","Peć","Prizren"],
+  "region":"Europe",
+  "subregion":"Eastern Europe",
+  "timezones":["UTC+01:00","UTC+02:00"],
+  "tld":[".rs"],
+  "translations":{"de":"Serbien","es":"Serbia","fr":"Serbie","ja":"セルビア","it":"Serbia"},
+  "wiki":"http://en.wikipedia.org/wiki/serbia"}
diff --git a/countryinfo/data_no_iso/burma.json b/countryinfo/data_no_iso/burma.json
index 7245d78..d1bdb7d 100644
--- a/countryinfo/data_no_iso/burma.json
+++ b/countryinfo/data_no_iso/burma.json
@@ -1,1 +1,24 @@
-{"name":"Burma","altSpellings":["Myanmar"],"capital":"Naypyidaw","currencies":["MMK"],"flag":"","geoJSON":{},"ISO":{},"provinces":["Ayeyarwady","Bago","Chin State","Kachin State","Kayah State","Kayin State","Magway","Mandalay","Mon State","Rakhine State","Sagaing","Shan State","Tanintharyi","Yangon"],"tld":[".mm"],"wiki":"http://en.wikipedia.org/wiki/burma"}
+{"name":"Burma",
+    "altSpellings":["Myanmar","Republic of the Union of Myanmar","Pyidaunzu Thanmăda Myăma Nainngandaw"],
+    "area":676570,
+    "borders":["BGD","CHN","IND","LAO","THA"],
+    "callingCodes":["95"],
+    "capital":"Naypyidaw",
+    "capital_latlng":[19.75,96.1],
+    "currencies":["MMK"],
+    "demonym":"Burmese",
+    "flag":"https://upload.wikimedia.org/wikipedia/commons/8/8c/Flag_of_Myanmar.svg",
+    "geoJSON":{},
+    "ISO":{"alpha2":"MM","alpha3":"MMR"},
+    "languages":["my"],
+    "nativeName":"Myanma",
+    "population":57526449,
+    "latlng":[22,98],
+    "provinces":["Ayeyarwady","Bago","Chin State","Kachin State","Kayah State","Kayin State","Magway","Mandalay","Mon State","Rakhine State","Sagaing","Shan State","Tanintharyi","Yangon"],
+    "region":"Asia",
+    "subregion":"South-Eastern Asia",
+    "timezones":["UTC+06:30"],
+    "tld":[".mm"],
+    "translations":{"de":"Myanmar","es":"Birmania","fr":"Birmanie","ja":"ミャンマー","it":"Birmania"},
+    "wiki":"http://en.wikipedia.org/wiki/burma"
+}
diff --git a/countryinfo/data_no_iso/scotland.json b/countryinfo/data_no_iso/scotland.json
index 2085ba6..3484bbc 100644
--- a/countryinfo/data_no_iso/scotland.json
+++ b/countryinfo/data_no_iso/scotland.json
@@ -1,13 +1,28 @@
 {
     "name": "Scotland",
-    "flag": "",
-    "geoJSON": {},
+    "altSpellings": [],
+    "area":80231,
+    "borders": [],
+    "callingCodes": ["+44"],
+    "capital": "Edinburgh",
+    "capital_latlng": [55.953252, -3.188267],
+    "currencies": ["GBP"],
     "demonym": "Scottish",
+    "flag": "https://upload.wikimedia.org/wikipedia/commons/1/10/Flag_of_Scotland.svg",
     "ISO": {
         "alpha2": "",
         "alpha3": ""
     },
+    "languages": ["English", "Scots", "Scottish Gaelic", "British Sign Language"],
+    "latlng": [56.4906712, -4.2026458],
+    "nativeName": "Alba",
+    "population": 5295000,
     "provinces": ["Aberdeen City", "Aberdeenshire", "Angus", "Argyll and Bute", "City of Edinburgh", "Clackmannanshire", "Dumfries and Galloway", "Dundee City", "East Ayrshire", "East Dunbartonshire", "East Lothian", "East Renfrewshire", "Eilean Siar (Western Isles)", "Falkirk", "Fife", "Glasgow City", "Highland", "Inverclyde", "Midlothian", "Moray", "North Ayrshire", "North Lanarkshire", "Orkney Islands", "Perth and Kinross", "Renfrewshire", "Shetland Islands", "South Ayrshire", "South Lanarkshire", "Stirling", "The Scottish Borders", "West Dunbartonshire", "West Lothian"],
-    "tld": [],
+    "region": "Europe",
+    "subregion": "Northern Europe",
+    "timezones": ["UTC+00:00"],
+    "tld": [".scot"],
+    "geoJSON": {},
+    "tranlations":{"de":"Schottland","es":"Escocia","fr":"Écosse","ja":"スコットランド","it":"Scozia"},
     "wiki": "http://en.wikipedia.org/wiki/scotland"
 }


Test patch:
diff --git a/tests.py b/tests.py
index 602c7cf..f7d3b61 100644
--- a/tests.py
+++ b/tests.py
@@ -7,6 +7,8 @@ class Tests(unittest.TestCase):
     all_countries = {}
 
     def setUp(self):
+        self.verificationErrors = [] #Variable used to collect non-fatal errors
+
         """Loads all the countries just once for all the tests
         """
         if not self.all_countries:
@@ -16,13 +18,18 @@ def setUp(self):
                 country = CountryInfo(name)
                 self.all_countries[name] = country
 
+    def tearDown(self):
+        """Loads and prints all exceptions encountered while running tests
+        """
+        self.assertEqual([], self.verificationErrors)
+
     def test_all_countries_have_name(self):
         for name in self.all_countries:
             try:
                 country = self.all_countries[name]
                 self.assertIsNotNone(country.name())
             except KeyError as err:
-                self.fail("Country '{0}' key error: {1}".format(name, err))
+                self.verificationErrors.append("name: "+ str(name))
 
     def test_all_countries_have_native_name(self):
         for name in self.all_countries:
@@ -30,7 +37,7 @@ def test_all_countries_have_native_name(self):
                 country = self.all_countries[name]
                 country.native_name()
             except KeyError as err:
-                self.fail("Country '{0}' key error: {1}".format(name, err))
+                self.verificationErrors.append("native_name: "+ str(name))
 
     def test_all_countries_have_iso(self):
         for name in self.all_countries:
@@ -38,7 +45,7 @@ def test_all_countries_have_iso(self):
                 country = self.all_countries[name]
                 country.iso()
             except KeyError as err:
-                self.fail("Country '{0}' key error: {1}".format(name, err))
+                self.verificationErrors.append("iso: "+ str(name))
 
     def test_all_countries_have_alt_spellings(self):
         for name in self.all_countries:
@@ -46,7 +53,7 @@ def test_all_countries_have_alt_spellings(self):
                 country = self.all_countries[name]
                 country.alt_spellings()
             except KeyError as err:
-                self.fail("Country '{0}' key error: {1}".format(name, err))
+                self.verificationErrors.append("alt_spellings: "+ str(name))
 
     def test_all_countries_have_translations(self):
         for name in self.all_countries:
@@ -54,7 +61,119 @@ def test_all_countries_have_translations(self):
                 country = self.all_countries[name]
                 country.translations()
             except KeyError as err:
-                self.fail("Country '{0}' key error: {1}".format(name, err))
+                self.verificationErrors.append("translations: "+ str(name))
+
+    def test_all_countries_have_latlng(self):
+        for name in self.all_countries:
+            try:
+                country = self.all_countries[name]
+                country.latlng()
+            except KeyError as err:
+                self.verificationErrors.append("latlng: "+ str(name))
+
+    def test_all_countries_have_area(self):
+        for name in self.all_countries:
+            try:
+                country = self.all_countries[name]
+                country.area()
+            except KeyError as err:
+                self.verificationErrors.append("area: "+ str(name))
+
+    def test_all_countries_have_callingCodes(self):
+        for name in self.all_countries:
+            try:
+                country = self.all_countries[name]
+                country.calling_codes()
+            except KeyError as err:
+                self.verificationErrors.append("callingCodes: "+ str(name))
+
+    def test_all_countries_have_capital(self):
+        for name in self.all_countries:
+            try:
+                country = self.all_countries[name]
+                country.capital()
+            except KeyError as err:
+                self.verificationErrors.append("capital: "+ str(name))
+
+    def test_all_countries_have_capital_latlng(self):
+        for name in self.all_countries:
+            try:
+                country = self.all_countries[name]
+                country.capital_latlng()
+            except KeyError as err:
+                self.verificationErrors.append("capital_latlng: "+ str(name))
+
+    def test_all_countries_have_currencies(self):
+        for name in self.all_countries:
+            try:
+                country = self.all_countries[name]
+                country.currencies()
+            except KeyError as err:
+                self.verificationErrors.append("currencies: "+ str(name))
+
+    def test_all_countries_have_demonym(self):
+        for name in self.all_countries:
+            try:
+                country = self.all_countries[name]
+                country.demonym()
+            except KeyError as err:
+                self.verificationErrors.append("demonym: "+ str(name))
+
+    def test_all_countries_have_population(self):
+        for name in self.all_countries:
+            try:
+                country = self.all_countries[name]
+                country.population()
+            except KeyError as err:
+                self.verificationErrors.append("population: "+ str(name))
+
+    def test_all_countries_have_provinces(self):
+        for name in self.all_countries:
+            try:
+                country = self.all_countries[name]
+                country.provinces()
+            except KeyError as err:
+                self.verificationErrors.append("provinces: "+ str(name))
+
+    def test_all_countries_have_region(self):
+        for name in self.all_countries:
+            try:
+                country = self.all_countries[name]
+                country.region()
+            except KeyError as err:
+                self.verificationErrors.append("region: "+ str(name))
+
+    def test_all_countries_have_subregion(self):
+        for name in self.all_countries:
+            try:
+                country = self.all_countries[name]
+                country.subregion()
+            except KeyError as err:
+                self.verificationErrors.append("subregion: "+ str(name))
+
+    def test_all_countries_have_timezones(self):
+        for name in self.all_countries:
+            try:
+                country = self.all_countries[name]
+                country.timezones()
+            except KeyError as err:
+                self.verificationErrors.append("timezones: "+ str(name))
+
+    def test_all_countries_have_tld(self):
+        for name in self.all_countries:
+            try:
+                country = self.all_countries[name]
+                country.tld()
+            except KeyError as err:
+                self.verificationErrors.append("tld "+ str(name))
+
+    def test_all_countries_have_wiki(self):
+        for name in self.all_countries:
+            try:
+                country = self.all_countries[name]
+                country.wiki()
+            except KeyError as err:
+                self.verificationErrors.append("wiki: "+ str(name))
 
     def test_select_country_from_alt_name(self):
         country = CountryInfo('PK')