diff --git a/README.md b/README.md
index d04cd9c72..9bd07c3c6 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,7 @@
 arduino-create-agent
 ====================
 
+## Installation
 Get the latest version of the Agent for all supported platforms:
 
 * [Windows](http://downloads.arduino.cc/CreateBridgeStable/ArduinoCreateAgent-1.1-windows-installer.exe)
@@ -11,6 +12,45 @@ arduino-create-agent is a fork of @johnlauer's serial-port-json-server (which we
 
 The history has been rewritten to keep the repo small (thus removing all binaries committed in the past)
 
+## Disable Autostart
+
+### Windows
+1. ![Type "Task Manager in the Windows Search Bar"](https://raw.githubusercontent.com/arduino/arduino-create-agent/master/images/windows/01.png)
+2. ![Select the .config dir in your home](https://raw.githubusercontent.com/arduino/arduino-create-agent/master/images/windows/02.png)
+3. ![Select the autostart dir](https://raw.githubusercontent.com/arduino/arduino-create-agent/master/images/windows/03.png)
+4. ![Move the file to the trash](https://raw.githubusercontent.com/arduino/arduino-create-agent/master/images/windows/04.png)
+
+### Mac OSX
+1. ![Open Finder, click on Go menu, select 'Go to Folder'](https://github.com/arduino/arduino-create-agent/master/images/mac/01.png)
+2. ![Type the directory containing the autolauncher file, change <username> with your Mac username, by default the directory is /Users/username/Library/LaunchAgents](https://raw.githubusercontent.com/arduino/arduino-create-agent/master/images/mac/02.png)
+3. ![Select the ArduinoCreateAgent.plist file](https://raw.githubusercontent.com/arduino/arduino-create-agent/master/images/mac/03.png)
+4. ![Right click on the file name and select 'Move to Trash'](https://raw.githubusercontent.com/arduino/arduino-create-agent/master/images/mac/04.png)
+
+---
+The command line way:
+```
+$ launchctl unload ~/Library/LaunchAgents/ArduinoCreateAgent.plist
+```
+
+### Linux
+1. ![Show hidden files](https://raw.githubusercontent.com/arduino/arduino-create-agent/master/images/linux/01.png)
+2. ![Select the .config dir in your home](https://raw.githubusercontent.com/arduino/arduino-create-agent/master/images/linux/02.png)
+3. ![Select the autostart dir](https://raw.githubusercontent.com/arduino/arduino-create-agent/master/images/linux/03.png)
+4. ![Move the file to the trash](https://raw.githubusercontent.com/arduino/arduino-create-agent/master/images/linux/04.png)
+
+---
+The command line way:
+
+Just remove the autostart file in your desktop manager, in Ubuntu is:
+```
+$ rm $HOME/.config/autostart/arduino-create-agent.desktop
+```
+To start manually the agent you can open the file at:
+```
+$ nohup $HOME/ArduinoCreateAgent-1.1/Arduino_Create_Bridge &
+```
+or in the location selected during the installation
+
 # Contributing
 
 Please use the current latest version:
diff --git a/images/linux/01.png b/images/linux/01.png
new file mode 100644
index 000000000..0745e2c6c
Binary files /dev/null and b/images/linux/01.png differ
diff --git a/images/linux/02.png b/images/linux/02.png
new file mode 100644
index 000000000..9ff5d24d9
Binary files /dev/null and b/images/linux/02.png differ
diff --git a/images/linux/03.png b/images/linux/03.png
new file mode 100644
index 000000000..228c3acf9
Binary files /dev/null and b/images/linux/03.png differ
diff --git a/images/linux/04.png b/images/linux/04.png
new file mode 100644
index 000000000..c45f03564
Binary files /dev/null and b/images/linux/04.png differ
diff --git a/images/mac/01.png b/images/mac/01.png
new file mode 100644
index 000000000..307b53886
Binary files /dev/null and b/images/mac/01.png differ
diff --git a/images/mac/02.png b/images/mac/02.png
new file mode 100644
index 000000000..410c379d4
Binary files /dev/null and b/images/mac/02.png differ
diff --git a/images/mac/03.png b/images/mac/03.png
new file mode 100644
index 000000000..771585bf4
Binary files /dev/null and b/images/mac/03.png differ
diff --git a/images/mac/04.png b/images/mac/04.png
new file mode 100644
index 000000000..2b74ea64c
Binary files /dev/null and b/images/mac/04.png differ
diff --git a/images/windows/01.png b/images/windows/01.png
new file mode 100644
index 000000000..1670ba142
Binary files /dev/null and b/images/windows/01.png differ
diff --git a/images/windows/02.png b/images/windows/02.png
new file mode 100644
index 000000000..eac805055
Binary files /dev/null and b/images/windows/02.png differ
diff --git a/images/windows/03.png b/images/windows/03.png
new file mode 100644
index 000000000..c832e87fc
Binary files /dev/null and b/images/windows/03.png differ
diff --git a/images/windows/04.png b/images/windows/04.png
new file mode 100644
index 000000000..37e048df7
Binary files /dev/null and b/images/windows/04.png differ