diff --git a/plugins/spotify.py b/plugins/spotify.py
index 83b61e1..a971711 100644
--- a/plugins/spotify.py
+++ b/plugins/spotify.py
@@ -1,23 +1,24 @@
 import re
-import time
 import spotimeta
 
 from util import hook, http
 
 gateway =  'http://open.spotify.com/{}/{}'  # http spotify gw address
-spotify_re = (r'(open\.spotify\.com\/(track|album|artist|user)\/'
+
+spotify_re = (r'(spotify:(track|album|artist|user):([a-zA-Z0-9]+))', re.I)
+http_re = (r'(open\.spotify\.com\/(track|album|artist|user)\/'
               '([a-zA-Z0-9]+))', re.I)
 
+@hook.regex(*http_re)
 @hook.regex(*spotify_re)
 def spotify_url(match):
-    spotify_type = match.group(2)
-    print spotify_type
+    type = match.group(2)
     spotify_id = match.group(3)
-    url = gateway.format(spotify_type, spotify_id)
+    url = gateway.format(type, spotify_id)
     data = spotimeta.lookup(url)
-    if spotify_type == "track":
-        return "Spotify Track: {} - {}".format(data["result"]["artist"]["name"], data["result"]["name"])
-    elif spotify_type == "artist":
-        return "Spotify Artist: {}".format(data["result"]["name"])
-    elif spotify_type == "album":
-        return "Spotify Album: {} - {}".format(data["result"]["artist"]["name"], data["result"]["name"])
\ No newline at end of file
+    if type == "track":
+        return u"Spotify Track: {} by {} from the album {}".format(data["result"]["name"], data["result"]["artist"]["name"], data["result"]["album"]["name"])
+    elif type == "artist":
+        return u"Spotify Artist: {}".format(data["result"]["name"])
+    elif type == "album":
+        return u"Spotify Album: {} - {}".format(data["result"]["artist"]["name"], data["result"]["name"])
\ No newline at end of file