diff --git a/README.md b/README.md
index f3f0fdb..3fc0f3f 100644
--- a/README.md
+++ b/README.md
@@ -8,31 +8,12 @@ your powerful Windows desktop to your embedded system, like Raspberry Pi, CuBox-
 
 For a demo see this [video](https://www.youtube.com/watch?v=XRW6O0bSHNw).
 
-[Moonlight-common-c](https://github.com/moonlight-stream/moonlight-common-c) is the shared codebase between
-different C implementations of Moonlight
-
-[Moonlight](https://github.com/moonlight-stream/moonlight-android) also has an Android
-implementation.
-
-[Moonlight-pc](https://github.com/moonlight-stream/moonlight-pc) also has an Linux/OSX/Windows
-implementation.
-
-[Moonlight iOS](https://github.com/moonlight-stream/moonlight-ios) also has an iOS
-implementation.
-
-[Moonlight Windows](https://github.com/moonlight-stream/moonlight-windows) also has an Windows and Windows Phone
-implementation.
-
 ##Features
 
 * Streams Steam and all of your games from your PC to your embedded system.
-
-##Installation
-
-* Download [GeForce Experience](http://www.geforce.com/geforce-experience) and install on your Windows PC
-* Download the compiled version from the [GitHub releases page](https://github.com/irtimmer/moonlight-embedded/releases)
-* Install libopus0 (Debian/Raspbian) or opus (Arch Linux/Fedora/Pidora)
-* [Configure sound](http://elinux.org/R-Pi_Troubleshooting#Sound)
+* Use mDNS to scan for compatible GeForce Experience (GFE) machines on the network.
+* Qwerty Keyboard, Mouse and Gamepad support
+* Support Raspberry Pi and i.MX 6 devices
 
 ##Requirements
 
@@ -54,6 +35,7 @@ implementation.
 
 	Actions:
 
+        map Create mapping file for gamepad
 	pair Pair device with computer
 	stream Stream computer to device
 	list List available games and applications
@@ -71,14 +53,18 @@ implementation.
 	-bitrate <bitrate> Specify the bitrate in Kbps
 	-packetsize <size> Specify the maximum packetsize in bytes
 	-app <app> Name of app to stream
+        -nosops Don't allow GFE to modify game settings
+        -input <device> Use <device> as input. Can be used multiple times
+        -mapping <file> Use <file> as gamepad mapping configuration file (use before -input)
+        -audio <device> Use <device> as ALSA audio output device (default sysdefault)
+        -localaudio Play audio locally
 
 	Use ctrl-c to exit application
 
-##Compile
+##Compile and install
 
-* Install cmake
-* Install cryptographics libraries libssl-dev (Debian/Raspbian) or openssl-devel (Fedora/Pidora) or openssl (Arch Linux)
-* Install audio libraries libopus-dev and libasound2-dev (Debian/Raspbian) or opus-devel and alsa-lib-devel (Fedora/Pidora) or opus and alsa-lib (Arch Linux)
+* Download and extract Moonlight Embedded from release or git clone
+* Install development dependencies
 * Initialize the git submodules ``git submodule update --init``
 
 ```
@@ -86,7 +72,45 @@ mkdir build
 cd build/
 cmake ../
 make
+make install
 ```
+## Dependencies
+
+ArchLinux/Debian (Raspbian)/Debian Development (Raspbian)
+* opus/libopus0/libopus-dev
+* expat/libexpat1/libexpat1-dev
+* openssl/libssl-dev/libssl-dev
+* alsa-lib/libasound2/libasound2-dev
+* systemd/libudev/libudev-dev
+* avahi/libavahi-client3/libavahi-client-dev
+* curl/libcurl3/libcurl4-openssl-dev
+* libevdev/libevdev2/libevdev-dev
+
+Development only dependencies
+* cmake
+* C compiler
+
+## See also
+
+[Moonlight-common-c](https://github.com/moonlight-stream/moonlight-common-c) is the shared codebase between
+different C implementations of Moonlight
+
+[Moonlight-common-c](https://github.com/irtimmer/moonlight-common-c) is the used fork used by Moonlight Embedded
+
+[Moonlight-common](https://github.com/moonlight-stream/moonlight-common) is the shared codebase between
+different Java implementations of Moonlight
+
+[Moonlight](https://github.com/moonlight-stream/moonlight-android) also has an Android
+implementation.
+
+[Moonlight-pc](https://github.com/moonlight-stream/moonlight-pc) also has an Linux/OSX/Windows
+implementation.
+
+[Moonlight iOS](https://github.com/moonlight-stream/moonlight-ios) also has an iOS
+implementation.
+
+[Moonlight Windows](https://github.com/moonlight-stream/moonlight-windows) also has an Windows and Windows Phone
+implementation.
 
 ## Discussion