diff --git a/classes/functions.php b/classes/functions.php
index 44e3fe4..d9b0d7a 100644
--- a/classes/functions.php
+++ b/classes/functions.php
@@ -120,14 +120,17 @@ if(!defined('entry') || !entry) die('Not a valid page');
 	}
 	
 	function isVimeoVideo($videoUrl) {
-		if (beginsWith($videoUrl, "http://vimeo.com/clip:") || beginsWith($videoUrl, "http://www.vimeo.com/clip:"))
+		if (beginsWith($videoUrl, "http://vimeo.com/") || beginsWith($videoUrl, "http://www.vimeo.com/"))
 			return true;
 		else
 			return false;
 	}
 	
 	function getVimeoVideoUrl($videoUrl) {
-		return array_pop(explode("clip:",$videoUrl));
+		if(substr_count($videoUrl,"clip:")==1)
+			return array_pop(explode("clip:",$videoUrl));
+		else
+			return array_pop(explode("/",$videoUrl));
 	}
 	
 	function isYoutubeVideo($videoUrl) {
diff --git a/classes/gelato.class.php b/classes/gelato.class.php
index b1ac868..4055e0c 100644
--- a/classes/gelato.class.php
+++ b/classes/gelato.class.php
@@ -174,7 +174,7 @@ class gelato extends Conexion_Mysql {
 			$id_video = getSlideSharePresentationCode($url);
 			return "\t\t\t<object type=\"application/x-shockwave-flash\" style=\"width:500px;height:393px\" data=\"http://www.slideshare.net/swf/player.swf?presentationId=".$id_video[0]."&amp;doc=".$id_video[1]."&amp;inContest=0&amp;startSlide=1\"><param name=\"quality\" value=\"high\" /></object>\n";
 		} else {
-			return "This URL is not a supported video (YouTube, Vimeo, DailyMotion or Yahoo Video)";
+			return "This URL is not a supported video (YouTube, Vimeo, DailyMotion, Yahoo Video or SlideShare)";
 		}		
 	}
 	function getMp3Player($url) {