diff --git a/.gitignore b/.gitignore
index cd5f8cd78..e28d825a6 100755
--- a/.gitignore
+++ b/.gitignore
@@ -38,6 +38,17 @@ deprecated/.DS_Store
 
 .DS_Store
 
+
+iguana/help/.tmpmarker
+
+iguana/genesis/.tmpmarker
+
+iguana/help.json
+
+iguana/autoAPI.md
+
+iguana/basilisk.o-2ad8cb38
+=======
 *.pbxproj
 
 iguana/tmp/.tmpmarker
diff --git a/.vscode/launch.json b/.vscode/launch.json
new file mode 100644
index 000000000..20c9e805a
--- /dev/null
+++ b/.vscode/launch.json
@@ -0,0 +1,22 @@
+{
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "C++ Launch (Windows)",
+            "type": "cppvsdbg",
+            "request": "launch",
+            "program": "enter program name, for example ${workspaceRoot}/a.exe",
+            "args": [],
+            "stopAtEntry": false,
+            "cwd": "${workspaceRoot}",
+            "environment": [],
+            "externalConsole": false
+        },
+        {
+            "name": "C++ Attach (Windows)",
+            "type": "cppvsdbg",
+            "request": "attach",
+            "processId": "${command:pickProcess}"
+        }
+    ]
+}
\ No newline at end of file
diff --git a/README.md b/README.md
index 2d49a0b55..d9dfd7341 100755
--- a/README.md
+++ b/README.md
@@ -223,3 +223,35 @@ sudo service ntp start
 
 Now things should be ready. To update and run notary node:
 pkill iguana; ./m_LP; tests/notaryinit
+
+
+
+##Build for OSX distribution##
+Get OSX SDK 10.6 from https://github.com/ca333/MacOSX-SDKs/releases/tag/10.6
+
+Unpack & move the .sdk folder to Xcodes SDK folder:
+
+```cd DownloadDirectory```
+
+```mv MacOSX10.6.sdk /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/.```
+
+If you are using Xcode > 7.3 add the new SDK to XCode by changing MinimumSDKVersion in your Info.plist:
+
+```vi /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Info.plist```
+
+Change the value to:
+
+```
+<key>MinimumSDKVersion</key>
+<string>10.6</string>
+```
+Build crypto777 library and agents with OSX release makefile:
+
+```./m_onetime m_osx_release```
+
+Execute the OSX deploy script:
+
+```
+./osx_deploy.sh
+```
+The iguana binary and its linked libraries are in ```$HOME/tmp/iguana```.
diff --git a/osx_deploy.sh b/osx_deploy.sh
index 4a7efa802..9fa0f5733 100755
--- a/osx_deploy.sh
+++ b/osx_deploy.sh
@@ -6,13 +6,21 @@ TMP_DIR=~/tmp/iguana
 mkdir -p $TMP_DIR
 echo "making $TMP_DIR"
 
-binaries=("iguana")
+binaries=("iguana" "marketmaker")
 
 for binary in "${binaries[@]}";
 do
     echo "copying $binary to $TMP_DIR"
 
-    cp agents/$binary $TMP_DIR
+    if [ "$binary" = "iguana" ]
+        then
+        cp agents/$binary $TMP_DIR
+    fi
+
+    if [ "$binary" = "marketmaker" ]
+        then
+        cp iguana/$binary $TMP_DIR
+    fi
 
     # find the dylibs to copy for iguana
     DYLIBS=`otool -L $TMP_DIR/$binary | grep "/usr/local" | awk -F' ' '{ print $1 }'`