diff --git a/CHANGELOG.md b/CHANGELOG.md
index 700b753..2c619fe 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Changelog
 
+## v3.0.0
+* Forked from original repos
+* Added video support
+* Added Search
+
 ## v2.0.6
 Released 14 January 2017
 * Upgrade to simpleplugin 2.1.0
diff --git a/addon.xml b/addon.xml
index baf66aa..1744e8a 100644
--- a/addon.xml
+++ b/addon.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="plugin.audio.subsonic" name="Subsonic" version="2.0.6" provider-name="BasilFX,grosbouff">
+<addon id="plugin.audio.subsonic" name="Subsonic" version="3.0.0" provider-name="BasilFX,grosbouff,silascutler">
 <requires>
     <import addon="xbmc.python" version="2.14.0"/>
     <import addon="script.module.dateutil" version="2.4.2"/>
@@ -38,7 +38,7 @@
         <license>MIT</license>
         <forum></forum>
         <website>http://www.subsonic.org</website>
-        <source>https://github.com/gordielachance/plugin.audio.subsonic</source>
+	<source>https://github.com/silascutler/KodiSubsonic</source>
         <email></email>
     </extension>
 </addon>
diff --git a/main.py b/main.py
index c17511f..b31e898 100644
--- a/main.py
+++ b/main.py
@@ -103,7 +103,12 @@ def root(params):
             'name':     Addon().get_localized_string(30022),
             'callback': 'list_playlists',
             'thumb': None
-        }
+        },
+        'search': {
+            'name':     Addon().get_localized_string(30039),
+            'callback': 'search',
+            'thumb': None
+        },  
     }
 
     # Iterate through categories
@@ -612,6 +617,38 @@ def list_playlists(params):
         #view_mode = None, #a numeric code for a skin view mode. View mode codes are different in different skins except for 50 (basic listing).
         #content = None #string - current plugin content, e.g. ‘movies’ or ‘episodes’.
     )
+@plugin.action()
+#@plugin.cached(cachetime) #cache (in minutes)
+def search(params):
+
+    dialog = xbmcgui.Dialog()
+    d = dialog.input(Addon().get_localized_string(30039), type=xbmcgui.INPUT_ALPHANUM)
+    if not d:
+        d = " "
+
+
+    # get connection
+    connection = get_connection()
+
+    if connection is False:
+        return
+
+    listing = []
+
+    # Get items
+    items = connection.search2(query=d)
+    # Iterate through items
+    for item in items.get('searchResult2').get('song'):
+        entry = get_entry_track( item, params)
+        listing.append(entry)
+
+    if len(listing) == 1:
+        plugin.log('One single Media Folder found; do return listing from browse_indexes()...')
+        return browse_indexes(params)
+    else:
+        return plugin.create_listing(listing)
+
+
 
 @plugin.action()
 def play_track(params):
diff --git a/resources/language/English/strings.po b/resources/language/English/strings.po
index 540d226..c2a98a5 100644
--- a/resources/language/English/strings.po
+++ b/resources/language/English/strings.po
@@ -152,3 +152,9 @@ msgstr ""
 msgctxt "#30038"
 msgid "Browse"
 msgstr ""
+
+msgctxt "#30039"
+msgid "Search"
+msgstr ""
+
+
diff --git a/resources/language/French/strings.po b/resources/language/French/strings.po
index f18855e..be3152b 100644
--- a/resources/language/French/strings.po
+++ b/resources/language/French/strings.po
@@ -151,3 +151,10 @@ msgstr "Pistes au hasard"
 msgctxt "#30038"
 msgid "Browse"
 msgstr "Parcourir"
+
+
+msgctxt "#30039"
+msgid "Chercher"
+msgstr ""
+
+
diff --git a/resources/language/German/strings.po b/resources/language/German/strings.po
index da3b3d2..dad4d91 100644
--- a/resources/language/German/strings.po
+++ b/resources/language/German/strings.po
@@ -151,3 +151,8 @@ msgstr "Zufällig lieder"
 msgctxt "#30038"
 msgid "Browse"
 msgstr "Durchsuchen"
+
+msgctxt "#30039"
+msgid "Suche"
+msgstr ""
+