diff --git a/res/values/strings.xml b/res/values/strings.xml
index 23f82b72..3052a140 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1,255 +1,258 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
     <string name="pref_plugin_telephony">Telephony notifier</string>
     <string name="pref_plugin_telephony_desc">Send notifications for SMS and calls</string>
     <string name="pref_plugin_battery">Battery report</string>
     <string name="pref_plugin_battery_desc">Periodically report battery status</string>
     <string name="pref_plugin_sftp">Filesystem expose</string>
     <string name="pref_plugin_sftp_desc">Allows to browse this device\'s filesystem remotely</string>
     <string name="pref_plugin_clipboard">Clipboard sync</string>
     <string name="pref_plugin_clipboard_desc">Share the clipboard content</string>
     <string name="pref_plugin_mousepad">Remote input</string>
     <string name="pref_plugin_mousepad_desc">Use your phone or tablet as a touchpad and keyboard</string>
     <string name="pref_plugin_remotekeyboard">Receive remote keypresses</string>
     <string name="pref_plugin_remotekeyboard_desc">Receive keypress events from remote devices</string>
     <string name="pref_plugin_mpris">Multimedia controls</string>
     <string name="pref_plugin_mpris_desc">Provides a remote control for your media player</string>
     <string name="pref_plugin_runcommand">Run Command</string>
     <string name="pref_plugin_runcommand_desc">Trigger remote commands from your phone or tablet</string>
     <string name="pref_plugin_contacts">Contacts Synchronizer</string>
     <string name="pref_plugin_contacts_desc">Allow synchronizing the device\'s contacts book</string>
     <string name="pref_plugin_ping">Ping</string>
     <string name="pref_plugin_ping_desc">Send and receive pings</string>
     <string name="pref_plugin_notifications">Notification sync</string>
     <string name="pref_plugin_notifications_desc">Access your notifications from other devices</string>
     <string name="pref_plugin_receive_notifications">Receive notifications</string>
     <string name="pref_plugin_receive_notifications_desc">Receive notifications from the other device and display them on Android</string>
     <string name="pref_plugin_sharereceiver">Share and receive</string>
     <string name="pref_plugin_sharereceiver_desc">Share files and URLs between devices</string>
     <string name="plugin_not_available">This feature is not available in your Android version</string>
     <string name="device_list_empty">No devices</string>
     <string name="ok">OK</string>
     <string name="cancel">Cancel</string>
     <string name="open_settings">Open settings</string>
     <string name="no_permissions">You need to grant permission to access notifications</string>
     <string name="no_permission_mprisreceiver">To be able to control your media players you need to grant access to the notifications</string>
     <string name="send_ping">Send ping</string>
     <string name="open_mpris_controls">Multimedia control</string>
     <string name="remotekeyboard_editing_only" translatable="false">remotekeyboard_editing_only</string>
     <string name="remotekeyboard_editing_only_title" translatable="true">Handle remote keys only when editing</string>
     <string name="remotekeyboard_not_connected" translatable="true">There is no active remote keyboard connection, establish one in kdeconnect</string>
     <string name="remotekeyboard_connected" translatable="true">Remote keyboard connection is active</string>
     <string name="remotekeyboard_multiple_connections" translatable="true">There is more than one remote keyboard connection, select the device to configure</string>
     <string name="open_mousepad">Remote input</string>
     <string name="mousepad_info">Move a finger on the screen to move the mouse cursor. Tap for a click, and use two/three fingers for right and middle buttons. Use 2 fingers to scroll. Use a long press to drag\'n drop.</string>
     <string name="mousepad_double_tap_settings_title">Set two finger tap action</string>
     <string name="mousepad_triple_tap_settings_title">Set three finger tap action</string>
     <string name="mousepad_sensitivity_settings_title">Set touchpad sensitivity</string>
     <string name="mousepad_double_tap_key" translatable="false">mousepad_double_tap_key</string>
     <string name="mousepad_triple_tap_key" translatable="false">mousepad_triple_tap_key</string>
     <string name="mousepad_sensitivity_key" translatable="false">mousepad_sensitivity_key</string>
     <string name="mousepad_scroll_direction_title">Reverse Scrolling Direction</string>
     <string name="mousepad_scroll_direction" translatable="false">mousepad_scroll_direction</string>
     <string-array name="mousepad_tap_entries">
         <item>Right click</item>
         <item>Middle click</item>
         <item>Nothing</item>
     </string-array>
     <string name="mousepad_default_double" translatable="false">right</string>
     <string name="mousepad_default_triple" translatable="false">middle</string>
     <string name="mousepad_default_sensitivity" translatable="false">default</string>
     <string-array name="mousepad_tap_values" translatable="false">
         <item>right</item>
         <item>middle</item>
         <item>none</item>
     </string-array>
     <string-array name="mousepad_sensitivity_entries">
         <item>Slowest</item>
         <item>Above Slowest</item>
         <item>Default</item>
         <item>Above Default</item>
         <item>Fastest</item>
     </string-array>
     <string-array name="mousepad_sensitivity_values" translatable="false">
         <item>slowest</item>
         <item>aboveSlowest</item>
         <item>default</item>
         <item>aboveDefault</item>
         <item>fastest</item>
     </string-array>
     <string name="category_connected_devices">Connected devices</string>
     <string name="category_not_paired_devices">Available devices</string>
     <string name="category_remembered_devices">Remembered devices</string>
     <string name="plugins_failed_to_load">Plugins failed to load (tap for more info):</string>
     <string name="device_menu_plugins">Plugin settings</string>
     <string name="device_menu_unpair">Unpair</string>
     <string name="device_not_reachable">Paired device not reachable</string>
     <string name="pair_new_device">Pair new device</string>
     <string name="unknown_device">Unknown device</string>
     <string name="error_not_reachable">Device not reachable</string>
     <string name="error_already_requested">Pairing already requested</string>
     <string name="error_already_paired">Device already paired</string>
     <string name="error_could_not_send_package">Could not send package</string>
     <string name="error_timed_out">Timed out</string>
     <string name="error_canceled_by_user">Canceled by user</string>
     <string name="error_canceled_by_other_peer">Canceled by other peer</string>
     <string name="error_invalid_key">Invalid key received</string>
     <string name="encryption_info_title">Encryption Info</string>
     <string name="encryption_info_msg_no_ssl">The other device doesn\'t use a recent version of KDE Connect, using the legacy encryption method.</string>
     <string name="my_device_fingerprint">SHA1 fingerprint of your device certificate is:</string>
     <string name="remote_device_fingerprint">SHA1 fingerprint of remote device certificate is:</string>
     <string name="pair_requested">Pair requested</string>
     <string name="pairing_request_from">Pairing request from %1s</string>
     <string name="received_url_title">Received link from %1s</string>
     <string name="received_url_text">Tap to open \'%1s\'</string>
     <string name="incoming_file_title">Incoming file from %1s</string>
     <string name="incoming_file_text">%1s</string>
     <string name="outgoing_file_title">Sending file to %1s</string>
     <string name="outgoing_files_title">Sending files to %1s</string>
     <plurals name="outgoing_files_text">
         <item quantity="one">Sent %1$d file</item>
         <item quantity="other">Sent %1$d out of %2$d files</item>
     </plurals>
     <string name="received_file_title">Received file from %1s</string>
     <string name="received_file_fail_title">Failed receiving file from %1s</string>
     <string name="received_file_text">Tap to open \'%1s\'</string>
     <string name="sent_file_title">Sent file to %1s</string>
     <string name="sent_file_text">%1s</string>
     <string name="sent_file_failed_title">Failed to send file to %1s</string>
     <string name="sent_file_failed_text">%1s</string>
     <string name="tap_to_answer">Tap to answer</string>
     <string name="reconnect">Reconnect</string>
     <string name="right_click">Send Right Click</string>
     <string name="middle_click">Send Middle Click</string>
     <string name="show_keyboard">Show Keyboard</string>
     <string name="device_not_paired">Device not paired</string>
     <string name="request_pairing">Request pairing</string>
     <string name="pairing_accept">Accept</string>
     <string name="pairing_reject">Reject</string>
     <string name="device">Device</string>
     <string name="pair_device">Pair device</string>
     <string name="remote_control">Remote control</string>
     <string name="settings">KDE Connect Settings</string>
     <string name="mpris_play">Play</string>
     <string name="mpris_pause">Pause</string>
     <string name="mpris_previous">Previous</string>
     <string name="mpris_rew">Rewind</string>
     <string name="mpris_ff">Fast-forward</string>
     <string name="mpris_next">Next</string>
     <string name="mpris_volume">Volume</string>
     <string name="mpris_settings">Multimedia Settings</string>
     <string name="mpris_time_settings_title">Forward/rewind buttons</string>
     <string name="mpris_time_settings_summary">Adjust the time to fast forward/rewind when pressed.</string>
     <string name="mpris_time_key" translatable="false">mpris_interval_time</string>
     <string-array name="mpris_time_entries">
         <item>10 seconds</item>
         <item>20 seconds</item>
         <item>30 seconds</item>
         <item>1 minute</item>
         <item>2 minutes</item>
     </string-array>
     <string name="mpris_time_default" translatable="false">10000000</string>
     <string-array name="mpris_time_entries_values" translatable="false">
         <item>10000000</item>
         <item>20000000</item>
         <item>30000000</item>
         <item>60000000</item>
         <item>120000000</item>
     </string-array>
     <string name="mpris_notification_settings_title">Show media control notification</string>
     <string name="mpris_notification_settings_summary">Allows controlling your media players without opening KDE Connect.</string>
     <string name="mpris_notification_key" translatable="false">mpris_notification_enabled</string>
     <string name="share_to">Share To...</string>
     <string name="protocol_version_older">This device uses an old protocol version</string>
     <string name="protocol_version_newer">This device uses a newer protocol version</string>
     <string name="general_settings">General Settings</string>
     <string name="plugin_settings">Settings</string>
     <string name="plugin_settings_with_name">%s settings</string>
     <string name="device_name">Device name</string>
     <string name="device_name_preference_summary">%s</string>
     <string name="invalid_device_name">Invalid device name</string>
     <string name="shareplugin_text_saved">Received text, saved to clipboard</string>
     <string name="custom_devices_settings">Custom device list</string>
     <string name="pair_device_action">Pair a new device</string>
     <string name="unpair_device_action">Unpair %s</string>
     <string name="custom_device_list">Add devices by IP</string>
     <string name="share_notification_preference">Noisy notifications</string>
     <string name="share_notification_preference_summary">Vibrate and play a sound when receiving a file</string>
     <string name="share_destination_customize">Customize destination directory</string>
     <string name="share_destination_customize_summary_disabled">Received files will appear in Downloads</string>
     <string name="share_destination_customize_summary_enabled">Files will be stored in the directory below</string>
     <string name="share_destination_folder_preference">Destination directory</string>
     <string name="share">Share</string>
     <string name="share_received_file">Share \"%s\"</string>
     <string name="title_activity_notification_filter">Notification filter</string>
     <string name="filter_apps_info">Notifications will be synchronized for the selected apps.</string>
     <string name="sftp_internal_storage">Internal storage</string>
     <string name="sftp_all_files">All files</string>
     <string name="sftp_sdcard_num">SD card %d</string>
     <string name="sftp_sdcard">SD card</string>
     <string name="sftp_readonly">(read only)</string>
     <string name="sftp_camera">Camera pictures</string>
     <string name="add_host">Add host/IP</string>
     <string name="add_host_hint">Hostname or IP</string>
     <string name="no_players_connected">No players found</string>
     <string name="custom_dev_list_help">Use this option only if your device is not automatically detected. Enter IP address or hostname below and touch the button to add it to the list. Touch an existing item to remove it from the list.</string>
     <string name="mpris_player_on_device">%1$s on %2$s</string>
     <string name="send_files">Send files</string>
 
     <string name="pairing_title">KDE Connect Devices</string>
     <string name="pairing_description">Other devices running KDE Connect in your same network should appear here.</string>
     <string name="device_paired">Device paired</string>
     <string name="device_rename_title">Rename device</string>
     <string name="device_rename_confirm">Rename</string>
     <string name="refresh">Refresh</string>
     <string name="unreachable_description">This paired device is not reachable. Make sure it is connected to your same network.</string>
     <string name="on_data_message">It looks like you are on a mobile data connection. KDE Connect only works on local networks.</string>
     <string name="no_file_browser">There are no file browsers installed.</string>
     <string name="pref_plugin_telepathy">Send SMS</string>
     <string name="pref_plugin_telepathy_desc">Send text messages from your desktop</string>
     <string name="plugin_not_supported">This plugin is not supported by the device</string>
     <string name="findmyphone_title">Find my phone</string>
     <string name="findmyphone_title_tablet">Find my tablet</string>
     <string name="findmyphone_title_tv">Find my TV</string>
     <string name="findmyphone_description">Rings this device so you can find it</string>
     <string name="findmyphone_found">Found</string>
 
     <string name="open">Open</string>
     <string name="close">Close</string>
 
     <string name="no_permissions_storage">You need to grant permissions to access the storage</string>
     <string name="plugins_need_permission">Some Plugins need permissions to work (tap for more info):</string>
     <string name="permission_explanation">This plugin needs permissions to work</string>
     <string name="optional_permission_explanation">You need to grant extra permissions to enable all functions</string>
     <string name="plugins_need_optional_permission">Some plugins have features disabled because of lack of permission (tap for more info):</string>
     <string name="sftp_permission_explanation">To access your files from your PC the app needs permission to access your phone\'s storage</string>
     <string name="share_optional_permission_explanation">To share files between your phone and your desktop you need to give access to the phone\'s storage</string>
     <string name="telepathy_permission_explanation">To read and write SMS from your desktop you need to give permission to SMS</string>
     <string name="telephony_permission_explanation">To see phone calls and SMS from the desktop you need to give permission to phone calls and SMS</string>
     <string name="telephony_optional_permission_explanation">To see a contact name instead of a phone number you need to give access to the phone\'s contacts</string>
     <string name="contacts_permission_explanation">To share your contacts book with the desktop, you need to give contacts permission</string>
     <string name="select_ringtone">Select a ringtone</string>
     <string name="telephony_pref_blocked_title">Blocked numbers</string>
     <string name="telephony_pref_blocked_dialog_desc">Don\'t show calls and SMS from these numbers. Please specify one number per line</string>
     <string name="mpris_coverart_description">Cover art of current media</string>
     <string name="device_icon_description">Device icon</string>
     <string name="settings_icon_description">Settings icon</string>
 
     <string name="add_command">Add a command</string>
     <string name="addcommand_explanation">There are no commands registered</string>
     <string name="addcommand_explanation2">You can add new commands in the KDE Connect System Settings</string>
     <string name="add_command_description">You can add commands on the desktop</string>
     <string name="pref_plugin_mprisreceiver">Media Player Control</string>
     <string name="pref_plugin_mprisreceiver_desc">Control your phones media players from another device</string>
 
     <string name="dark_theme">Dark theme</string>
     <string name="mpris_stop">Stop the current player</string>
     <string name="copy_url_to_clipboard">Copy URL to clipboard</string>
     <string name="clipboard_toast">Copied to clipboard</string>
     <string name="runcommand_notreachable">Device is not reachable</string>
     <string name="runcommand_notpaired">Device is not paired</string>
     <string name="runcommand_nosuchdevice">There is no such device</string>
     <string name="runcommand_noruncommandplugin">This device does not have the Run Command Plugin enabled</string>
+    <string name="pref_plugin_findremotedevice">Find remote device</string>
+    <string name="pref_plugin_findremotedevice_desc">Ring your remote device</string>
+    <string name="ring">Ring</string>
 
 </resources>
diff --git a/src/org/kde/kdeconnect/Plugins/FindRemoteDevicePlugin/FindRemoteDevicePlugin.java b/src/org/kde/kdeconnect/Plugins/FindRemoteDevicePlugin/FindRemoteDevicePlugin.java
new file mode 100644
index 00000000..56e53a7a
--- /dev/null
+++ b/src/org/kde/kdeconnect/Plugins/FindRemoteDevicePlugin/FindRemoteDevicePlugin.java
@@ -0,0 +1,80 @@
+/*
+ * Copyright 2014 Albert Vaca Cintora <albertvaka@gmail.com>
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License or (at your option) version 3 or any later version
+ * accepted by the membership of KDE e.V. (or its successor approved
+ * by the membership of KDE e.V.), which shall act as a proxy
+ * defined in Section 14 of version 3 of the license.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+
+package org.kde.kdeconnect.Plugins.FindRemoteDevicePlugin;
+
+import android.app.Activity;
+
+import org.kde.kdeconnect.NetworkPacket;
+import org.kde.kdeconnect.Plugins.FindMyPhonePlugin.FindMyPhonePlugin;
+import org.kde.kdeconnect.Plugins.Plugin;
+import org.kde.kdeconnect_tp.R;
+
+
+public class FindRemoteDevicePlugin extends Plugin {
+
+    @Override
+    public String getDisplayName() {
+        return context.getResources().getString(R.string.pref_plugin_findremotedevice);
+    }
+
+    @Override
+    public String getDescription() {
+        return context.getResources().getString(R.string.pref_plugin_findremotedevice_desc);
+    }
+
+    @Override
+    public boolean onPacketReceived(NetworkPacket np) {
+        return true;
+    }
+
+    @Override
+    public String getActionName() {
+        return context.getString(R.string.ring);
+    }
+
+    @Override
+    public void startMainActivity(Activity activity) {
+        if (device != null) {
+            device.sendPacket(new NetworkPacket(FindMyPhonePlugin.PACKET_TYPE_FINDMYPHONE_REQUEST));
+        }
+    }
+
+    @Override
+    public boolean hasMainActivity() {
+        return true;
+    }
+
+    @Override
+    public boolean displayInContextMenu() {
+        return true;
+    }
+
+    @Override
+    public String[] getSupportedPacketTypes() {
+        return new String[]{};
+    }
+
+    @Override
+    public String[] getOutgoingPacketTypes() {
+        return new String[]{FindMyPhonePlugin.PACKET_TYPE_FINDMYPHONE_REQUEST};
+    }
+
+}
diff --git a/src/org/kde/kdeconnect/Plugins/PluginFactory.java b/src/org/kde/kdeconnect/Plugins/PluginFactory.java
index 27baaf73..42ff6846 100644
--- a/src/org/kde/kdeconnect/Plugins/PluginFactory.java
+++ b/src/org/kde/kdeconnect/Plugins/PluginFactory.java
@@ -1,228 +1,230 @@
 /*
  * Copyright 2014 Albert Vaca Cintora <albertvaka@gmail.com>
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU General Public License as
  * published by the Free Software Foundation; either version 2 of
  * the License or (at your option) version 3 or any later version
  * accepted by the membership of KDE e.V. (or its successor approved
  * by the membership of KDE e.V.), which shall act as a proxy
  * defined in Section 14 of version 3 of the license.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>. 
 */
 
 package org.kde.kdeconnect.Plugins;
 
 import android.content.Context;
 import android.graphics.drawable.Drawable;
 import android.util.Log;
 
 import org.kde.kdeconnect.Device;
 import org.kde.kdeconnect.Plugins.BatteryPlugin.BatteryPlugin;
 import org.kde.kdeconnect.Plugins.ClibpoardPlugin.ClipboardPlugin;
 import org.kde.kdeconnect.Plugins.ContactsPlugin.ContactsPlugin;
 import org.kde.kdeconnect.Plugins.FindMyPhonePlugin.FindMyPhonePlugin;
+import org.kde.kdeconnect.Plugins.FindRemoteDevicePlugin.FindRemoteDevicePlugin;
 import org.kde.kdeconnect.Plugins.MousePadPlugin.MousePadPlugin;
 import org.kde.kdeconnect.Plugins.MprisPlugin.MprisPlugin;
 import org.kde.kdeconnect.Plugins.MprisReceiverPlugin.MprisReceiverPlugin;
 import org.kde.kdeconnect.Plugins.NotificationsPlugin.NotificationsPlugin;
 import org.kde.kdeconnect.Plugins.PingPlugin.PingPlugin;
 import org.kde.kdeconnect.Plugins.ReceiveNotificationsPlugin.ReceiveNotificationsPlugin;
 import org.kde.kdeconnect.Plugins.RemoteKeyboardPlugin.RemoteKeyboardPlugin;
 import org.kde.kdeconnect.Plugins.RunCommandPlugin.RunCommandPlugin;
 import org.kde.kdeconnect.Plugins.SftpPlugin.SftpPlugin;
 import org.kde.kdeconnect.Plugins.SharePlugin.SharePlugin;
 import org.kde.kdeconnect.Plugins.TelepathyPlugin.TelepathyPlugin;
 import org.kde.kdeconnect.Plugins.TelephonyPlugin.TelephonyPlugin;
 
 import java.util.Collections;
 import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 import java.util.TreeMap;
 
 public class PluginFactory {
 
     public static class PluginInfo {
 
         public PluginInfo(String displayName, String description, Drawable icon,
                           boolean enabledByDefault, boolean hasSettings, boolean listenToUnpaired,
                           String[] supportedPacketTypes, String[] outgoingPacketTypes) {
             this.displayName = displayName;
             this.description = description;
             this.icon = icon;
             this.enabledByDefault = enabledByDefault;
             this.hasSettings = hasSettings;
             this.listenToUnpaired = listenToUnpaired;
             HashSet<String> incoming = new HashSet<>();
             if (supportedPacketTypes != null) Collections.addAll(incoming, supportedPacketTypes);
             this.supportedPacketTypes = Collections.unmodifiableSet(incoming);
             HashSet<String> outgoing = new HashSet<>();
             if (outgoingPacketTypes != null) Collections.addAll(outgoing, outgoingPacketTypes);
             this.outgoingPacketTypes = Collections.unmodifiableSet(outgoing);
         }
 
         public String getDisplayName() {
             return displayName;
         }
 
         public String getDescription() {
             return description;
         }
 
         public Drawable getIcon() {
             return icon;
         }
 
         public boolean hasSettings() {
             return hasSettings;
         }
 
         public boolean isEnabledByDefault() {
             return enabledByDefault;
         }
 
         public boolean listenToUnpaired() {
             return listenToUnpaired;
         }
 
         public Set<String> getOutgoingPacketTypes() {
             return outgoingPacketTypes;
         }
 
         public Set<String> getSupportedPacketTypes() {
             return supportedPacketTypes;
         }
 
         private final String displayName;
         private final String description;
         private final Drawable icon;
         private final boolean enabledByDefault;
         private final boolean hasSettings;
         private final boolean listenToUnpaired;
         private final Set<String> supportedPacketTypes;
         private final Set<String> outgoingPacketTypes;
 
     }
 
     private static final Map<String, Class> availablePlugins = new TreeMap<>();
     private static final Map<String, PluginInfo> pluginInfoCache = new TreeMap<>();
 
     static {
         PluginFactory.registerPlugin(TelephonyPlugin.class);
         PluginFactory.registerPlugin(PingPlugin.class);
         PluginFactory.registerPlugin(MprisPlugin.class);
         PluginFactory.registerPlugin(ClipboardPlugin.class);
         PluginFactory.registerPlugin(BatteryPlugin.class);
         PluginFactory.registerPlugin(SftpPlugin.class);
         PluginFactory.registerPlugin(NotificationsPlugin.class);
         PluginFactory.registerPlugin(ReceiveNotificationsPlugin.class);
         PluginFactory.registerPlugin(MousePadPlugin.class);
         PluginFactory.registerPlugin(SharePlugin.class);
         PluginFactory.registerPlugin(TelepathyPlugin.class);
         PluginFactory.registerPlugin(FindMyPhonePlugin.class);
         PluginFactory.registerPlugin(RunCommandPlugin.class);
         PluginFactory.registerPlugin(ContactsPlugin.class);
         PluginFactory.registerPlugin(RemoteKeyboardPlugin.class);
         //PluginFactory.registerPlugin(MprisReceiverPlugin.class);
+        PluginFactory.registerPlugin(FindRemoteDevicePlugin.class);
     }
 
     public static PluginInfo getPluginInfo(Context context, String pluginKey) {
 
         PluginInfo info = pluginInfoCache.get(pluginKey); //Is it cached?
         if (info != null) {
             return info;
         }
 
         try {
             Plugin p = ((Plugin) availablePlugins.get(pluginKey).newInstance());
             p.setContext(context, null);
             info = new PluginInfo(p.getDisplayName(), p.getDescription(), p.getIcon(),
                     p.isEnabledByDefault(), p.hasSettings(), p.listensToUnpairedDevices(),
                     p.getSupportedPacketTypes(), p.getOutgoingPacketTypes());
             pluginInfoCache.put(pluginKey, info); //Cache it
             return info;
         } catch (Exception e) {
             Log.e("PluginFactory", "getPluginInfo exception");
             e.printStackTrace();
             throw new RuntimeException(e);
         }
 
     }
 
     public static Set<String> getAvailablePlugins() {
         return availablePlugins.keySet();
     }
 
     public static Plugin instantiatePluginForDevice(Context context, String pluginKey, Device device) {
         Class c = availablePlugins.get(pluginKey);
         if (c == null) {
             Log.e("PluginFactory", "Plugin not found: " + pluginKey);
             return null;
         }
 
         try {
             Plugin plugin = (Plugin) c.newInstance();
             plugin.setContext(context, device);
             return plugin;
         } catch (Exception e) {
             Log.e("PluginFactory", "Could not instantiate plugin: " + pluginKey);
             e.printStackTrace();
             return null;
         }
 
     }
 
     public static void registerPlugin(Class<? extends Plugin> pluginClass) {
         try {
             String pluginKey = Plugin.getPluginKey(pluginClass);
             availablePlugins.put(pluginKey, pluginClass);
         } catch (Exception e) {
             Log.e("PluginFactory", "addPlugin exception");
             e.printStackTrace();
         }
     }
 
 
     public static Set<String> getIncomingCapabilities(Context context) {
         HashSet<String> capabilities = new HashSet<>();
         for (String pluginId : availablePlugins.keySet()) {
             PluginInfo plugin = getPluginInfo(context, pluginId);
             capabilities.addAll(plugin.getSupportedPacketTypes());
         }
 
         return capabilities;
     }
 
     public static Set<String> getOutgoingCapabilities(Context context) {
         HashSet<String> capabilities = new HashSet<>();
         for (String pluginId : availablePlugins.keySet()) {
             PluginInfo plugin = getPluginInfo(context, pluginId);
             capabilities.addAll(plugin.getOutgoingPacketTypes());
         }
         return capabilities;
     }
 
     public static Set<String> pluginsForCapabilities(Context context, Set<String> incoming, Set<String> outgoing) {
         HashSet<String> plugins = new HashSet<>();
         for (String pluginId : availablePlugins.keySet()) {
             PluginInfo plugin = getPluginInfo(context, pluginId);
             //Check incoming against outgoing
             if (Collections.disjoint(outgoing, plugin.getSupportedPacketTypes())
                     && Collections.disjoint(incoming, plugin.getOutgoingPacketTypes())) {
                 Log.i("PluginFactory", "Won't load " + pluginId + " because of unmatched capabilities");
                 continue; //No capabilities in common, do not load this plugin
             }
             plugins.add(pluginId);
         }
         return plugins;
     }
 
 }