diff --git a/README.md b/README.md
index 01624e5f..ef67e328 100644
--- a/README.md
+++ b/README.md
@@ -2,24 +2,23 @@ Gadgetbridge
 ============
 
 Gadgetbridge is a Android (4.4+) Application which will allow you to use your
-Gadget (Smartwatches/Fitness Bands etc) without the vendors closed source
-application and without the need to create an account and sync your data to the
-vendors servers.
+Pebble without the vendors closed source application and without the need to
+create an account and transmit any of your data to the vendors servers.
 
-Right now this is in very early testing stages and only supports the Pebble.
-
-USE IT AT YOUR OWN RISK. It will problably not work. And if it works it will
-annoy you more than it helps you ;)
+We plan to add support for the Mi Band and maybe even more devices.
 
 Features:
 
 * Incoming calls notification and display (caller, phone number)
+* Outgoing call display
+* Reject/Hangup Calls
 * SMS notification (sender, body)
 * K-9 Mail notification support (sender, subject, preview)
 * Support for generic notificaions (above filtered out)
 * Apollo Music Playback info (artist, album, track)
+* Music Control: Play/Pause, Next Track, Previous Track
 
-How to use (Pebble):
+How to use:
 
 1. Pair your Pebble though the Android Bluetooth Settings
 2. Start Gadgetbridge, press "connect"
@@ -28,7 +27,6 @@ How to use (Pebble):
 Known Issues:
 
 * No reconnect, if connection is lost, you have to press "connect" again
-* Can't reject or hang up phone calls yet
 * Notifications are not properly queued, if two arrive at about the same time,
   one of them might get lost (TODO: confirm)
 * Android 4.4+ only, we can only change this by not handling generic
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index a3b3cfe4..6f4bd216 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -5,6 +5,7 @@
     <uses-permission android:name="android.permission.BLUETOOTH" />
     <uses-permission android:name="android.permission.READ_PHONE_STATE" />
     <uses-permission android:name="android.permission.PROCESS_OUTGOING_CALLS" />
+    <uses-permission android:name="android.permission.CALL_PHONE" />
     <uses-permission android:name="android.permission.RECEIVE_SMS" />
     <uses-permission android:name="android.permission.READ_CONTACTS" />
     <uses-permission android:name="com.fsck.k9.permission.READ_MESSAGES" />
@@ -77,6 +78,11 @@
                 <action android:name="nodomain.freeyourgadget.gadgetbridge.musiccontrol" />
             </intent-filter>
         </receiver>
+        <receiver android:name=".GBCallControlReceiver">
+            <intent-filter>
+                <action android:name="nodomain.freeyourgadget.gadgetbridge.callcontrol" />
+            </intent-filter>
+        </receiver>
 
         <activity
             android:name=".DebugActivity"
diff --git a/app/src/main/aidl/com/android/internal/telephony/ITelephony.aidl b/app/src/main/aidl/com/android/internal/telephony/ITelephony.aidl
new file mode 100644
index 00000000..5eeb60e5
--- /dev/null
+++ b/app/src/main/aidl/com/android/internal/telephony/ITelephony.aidl
@@ -0,0 +1,8 @@
+package com.android.internal.telephony;
+
+
+interface ITelephony {
+    boolean endCall();
+    void answerRingingCall();
+    void silenceRinger();
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/BluetoothCommunicationService.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/BluetoothCommunicationService.java
index a1e83306..89fcfd11 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/BluetoothCommunicationService.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/BluetoothCommunicationService.java
@@ -118,12 +118,15 @@ public class BluetoothCommunicationService extends Service {
         switch (cmdBundle.commandClass) {
             case MUSIC_CONTROL:
                 Log.i(TAG, "Got command for MUSIC_CONTROL");
-                Intent i = new Intent(GBMusicControlReceiver.ACTION_MUSICCONTROL);
-                i.putExtra("command", cmdBundle.command.ordinal());
-                sendBroadcast(i);
+                Intent musicintent = new Intent(GBMusicControlReceiver.ACTION_MUSICCONTROL);
+                musicintent.putExtra("command", cmdBundle.command.ordinal());
+                sendBroadcast(musicintent);
                 break;
             case CALL_CONTROL:
                 Log.i(TAG, "Got command for CALL_CONTROL");
+                Intent callintent = new Intent(GBCallControlReceiver.ACTION_CALLCONTROL);
+                callintent.putExtra("command", cmdBundle.command.ordinal());
+                sendBroadcast(callintent);
                 break;
             default:
                 break;
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/GBCallControlReceiver.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/GBCallControlReceiver.java
new file mode 100644
index 00000000..d1db7904
--- /dev/null
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/GBCallControlReceiver.java
@@ -0,0 +1,40 @@
+package nodomain.freeyourgadget.gadgetbridge;
+
+import android.content.BroadcastReceiver;
+import android.content.Context;
+import android.content.Intent;
+import android.telephony.TelephonyManager;
+import android.util.Log;
+
+import com.android.internal.telephony.ITelephony;
+
+import java.lang.reflect.Method;
+
+public class GBCallControlReceiver extends BroadcastReceiver {
+    private final String TAG = this.getClass().getSimpleName();
+
+    public static final String ACTION_CALLCONTROL = "nodomain.freeyourgadget.gadgetbridge.callcontrol";
+
+    @Override
+    public void onReceive(Context context, Intent intent) {
+        GBCommand command = GBCommand.values()[intent.getIntExtra("command", 0)];
+        int keyCode;
+        switch (command) {
+            case CALL_END:
+                try {
+                    TelephonyManager telephonyManager = (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
+                    Class clazz = Class.forName(telephonyManager.getClass().getName());
+                    Method method = clazz.getDeclaredMethod("getITelephony");
+                    method.setAccessible(true);
+                    ITelephony telephonyService = (ITelephony) method.invoke(telephonyManager);
+                    telephonyService.endCall();
+                } catch (Exception e) {
+                    Log.w(TAG, "could not hangup call");
+                }
+                break;
+            default:
+                return;
+        }
+
+    }
+}
diff --git a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/PebbleProtocol.java b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/PebbleProtocol.java
index 6adce189..d8f7c863 100644
--- a/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/PebbleProtocol.java
+++ b/app/src/main/java/nodomain/freeyourgadget/gadgetbridge/PebbleProtocol.java
@@ -1,10 +1,15 @@
 package nodomain.freeyourgadget.gadgetbridge;
 
+import android.util.Log;
+
 import java.nio.ByteBuffer;
 import java.nio.ByteOrder;
 import java.util.SimpleTimeZone;
 
 public class PebbleProtocol {
+
+    static private String TAG = "PebbleProtocol";
+
     static final short ENDPOINT_FIRMWARE = 1;
     static final short ENDPOINT_TIME = 11;
     static final short ENDPOINT_FIRMWAREVERSION = 16;
@@ -253,6 +258,18 @@ public class PebbleProtocol {
                         break;
                 }
                 break;
+            case ENDPOINT_PHONECONTROL:
+                cmd.commandClass = GBCommandClass.CALL_CONTROL;
+                switch (pebbleCmd) {
+                    case PHONECONTROL_HANGUP:
+                        cmd.command = GBCommand.CALL_END;
+                        break;
+                    default:
+                        Log.i(TAG, "Unknown PHONECONTROL command" + pebbleCmd);
+                        cmd.command = GBCommand.UNDEFINEND;
+                        break;
+                }
+                break;
             default:
                 return null;
         }