diff --git a/README.md b/README.md
index 051f9e5e..eefacd3e 100644
--- a/README.md
+++ b/README.md
@@ -4,9 +4,9 @@ Elite: Dangerous Market Connector
 This app downloads commodity market data from the game [Elite: Dangerous](https://www.elitedangerous.com/) and, at your choice, either:
 
 * transmits the data to the Elite Dangerous Data Network ("EDDN") from where you and others can use it via online trading tools such as [eddb](http://eddb.io/).
-* saves the data to files on your disk which you can load into trading tools such as [Slopey's BPC Market Tool](https://forums.frontier.co.uk/showthread.php?t=53037).
+* saves the data to files on your disk which you can load into trading tools such as [Slopey's BPC Market Tool](https://forums.frontier.co.uk/showthread.php?t=76081).
 
-The user-interface is deliberately minimal - just press the "Update" button to download and automatically transmit/save the commodity market data from the station where you're currently docked in-game:
+The user-interface is deliberately minimal - just press the "Update" button to download and automatically transmit/save the commodity market data for the station where you're currently docked in-game:
 
 ![Windows screenshot](img/win.png) ![Mac screenshot](img/mac.png)
 
@@ -17,16 +17,16 @@ Installation
 Mac:
 
 * Requires Mac OS 10.9 or later.
-* Download the `.zip` file of the [latest release](https://github.com/Marginal/EDMarketConnector/releases/latest).
+* Download the `.zip` archive of the [latest release](https://github.com/Marginal/EDMarketConnector/releases/latest).
 * The zip archive contains the **EDMarketConnector** app - move this app to **Applications** or wherever you want it.
 * Double-click on the app to run it.
 
 Windows:
 
 * Requires Windows 7 or later.
-* Download the `.msi` file of the [latest release](https://github.com/Marginal/EDMarketConnector/releases/latest).
+* Download the `.msi` package of the [latest release](https://github.com/Marginal/EDMarketConnector/releases/latest).
 * Double-click on it.
-* The Installer will walk you through the installation process.
+* Windows Installer will walk you through the installation process.
 * Run **EDMarketConnector** from the Start menu.
 
 
diff --git a/img/mac.png b/img/mac.png
index b2eda549..73f3f429 100644
Binary files a/img/mac.png and b/img/mac.png differ
diff --git a/img/win.png b/img/win.png
index f31bb7aa..e84b3504 100644
Binary files a/img/win.png and b/img/win.png differ
diff --git a/setup.py b/setup.py
index a636d0e2..ad02202d 100755
--- a/setup.py
+++ b/setup.py
@@ -69,8 +69,7 @@ PY2APP_OPTIONS = {'dist_dir': dist_dir,
 
 PY2EXE_OPTIONS = {'dist_dir': dist_dir,
                   'optimize': 2,
-                  'packages': [ 'requests', 'encodings.ascii','encodings.mbcs','encodings.latin_1','encodings.utf_8','encodings.utf_16','encodings.cp437' ],
-                  #'ascii': True,	# suppress other encodings
+                  'packages': [ 'requests' ],
               }
 
 if sys.platform=='win32':
@@ -87,7 +86,6 @@ setup(
     windows = [ {'script': APP,
                  'icon_resources': [(0, '%s.ico' % APPNAME)],
                  'copyright': u'© 2015 Jonathan Harris',
-                 #XXX 'other_resources': [(24, 1, manifest)],
              } ],
     data_files = DATA_FILES,
     options = { 'py2app': PY2APP_OPTIONS,
@@ -97,10 +95,11 @@ setup(
 
 
 if sys.platform == 'darwin':
-    if macdeveloperid:
-        os.system('codesign --deep -v -s "Developer ID Application: %s" %s/%s.app' % (macdeveloperid, dist_dir, APPNAME))
-    # Make zip for distribution, preserving signature
-    os.system('cd %s; ditto -ck --keepParent --sequesterRsrc %s.app ../%s_mac_%s.zip; cd ..' % (dist_dir, APPNAME, APPNAME, VERSION))
+    if isdir('%s/%s.app' % (dist_dir, APPNAME)):
+        if macdeveloperid:
+            os.system('codesign --deep -v -s "Developer ID Application: %s" %s/%s.app' % (macdeveloperid, dist_dir, APPNAME))
+        # Make zip for distribution, preserving signature
+        os.system('cd %s; ditto -ck --keepParent --sequesterRsrc %s.app ../%s_mac_%s.zip; cd ..' % (dist_dir, APPNAME, APPNAME, VERSION))
 else:
     # Manually trim the tcl/tk folders
     os.unlink(join(dist_dir, 'w9xpopen.exe'))