diff --git a/json2kml.py b/json2kml.py
index 34988f0..f0262f0 100644
--- a/json2kml.py
+++ b/json2kml.py
@@ -1,52 +1,70 @@
-#####################################################################################
+###############################################################################
 # Python script to convert Google Maps JSON file to a KML file
 # Copyright (C) 2017 Dimitri Souza
 # https://github.com/dmrsouza/json2kml
-#####################################################################################
+###############################################################################
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License v3 as published by
 # the Free Software Foundation.
-#####################################################################################
-   
+###############################################################################
+
 import json
 import simplekml
 import sys
 import codecs
+import html
+
+try:
+    inputFile = sys.argv[1]
+except IndexError:
+    print("Usage: python json2kml.py filename.json")
+    exit(1)
 
-inputFile = "Saved Places.json"
-outputFile = "Saved Places.kml"
+outputFile = f'{inputFile[:-5]} [json2kml.py].kml'
 
 # JSON Encoding is UTF-8. Change stdout to UTF-8 to prevent encoding error
 # when calling print titles inside the loop
-sys.stdout = codecs.getwriter("utf-8")(sys.stdout.detach())
+# sys.stdout = codecs.getwriter("utf-8")(sys.stdout.detach())
+
+print(f'Opening file "{inputFile}"')
 
-print ('Opening file "'+inputFile+'"')
+with open(inputFile, encoding='utf8') as jsonFile:
+    data = json.load(jsonFile)
 
-with open (inputFile) as jsonFile:
-    data = json.load (jsonFile)
-    
-kml = simplekml.Kml ()
+kml = simplekml.Kml()
+kml.resetidcounter()
 kml.document.name = outputFile
 
 count = 0
 for place in data["features"]:
     if place["type"] == "Feature":
-        title = place["properties"]["Title"]
-        print ('Parsing place "'+title+'"')
-        
-        placeLocation = place["properties"]["Location"]
+        try:
+            name = place["properties"]["Title"]
+        except KeyError:
+            name = place["properties"]["name"]
+        print(f'Parsing place "{name}"')
+
         lon = place["geometry"]["coordinates"][0]
         lat = place["geometry"]["coordinates"][1]
-        
-        if "Address" in placeLocation:
-            address = placeLocation ["Address"]
-        else:
-            address = "N/A"
-        
-        kml.newpoint (name=title, coords=[(lon,lat)], address=address)
+
+        try:
+            placeLocation = place["properties"]["Location"]
+
+            if "Address" in placeLocation:
+                address = html.escape(placeLocation["Address"])
+            else:
+                address = None
+
+        except KeyError:
+            if 'address' in place['properties']:
+                address = html.escape(place['properties']['address'])
+            else:
+                address = None
+
+        kml.newpoint(name=name, coords=[(lon, lat)], address=address)
         count += 1
-        
-print ('Saving file "'+outputFile+'"')
-kml.save (outputFile)
 
-print ('Done! Total of '+str(count)+' places saved to the KML file.')
+print(f'Saving file "{outputFile}"')
+kml.save(outputFile)
+
+print(f'Done! Total of {count} places saved to the KML file.')