diff --git a/jquery.ytChanPlayer.js b/jquery.ytChanPlayer.js
index 50ae950..4014f32 100644
--- a/jquery.ytChanPlayer.js
+++ b/jquery.ytChanPlayer.js
@@ -1,133 +1,148 @@
-/* jQuery Youtube Channel Player 0.1.3
- * Author: Marc Loehe (boundaryfunctions)
- * Based on jQuery.youtubeChannel by Miguel Guerreiro (dharyk)
- * Licensed under the MIT license
+/* jQuery Youtube Channel Player 0.2.0
+ * Author: Marc Löhe <marc@marcloehe.de>
+ * Licensed under the MIT license.
  */
 
 (function ($) {
+
   "use strict";
-	$.fn.ytChanPlayer = function (settings) {
-		var $ytEl	= $(this),
-			$ytPlayer,
-			$ytList	= $('<ul/>', {'class': 'yt-channel-list'}),
-			options	= $.extend({}, {
-			  username: '',
-			  query: '',
-			  startIndex: 1,
-			  maxResults: 10,
-			  orderBy: 'published',
-			  playerOpts: {
-			    autohide: 1,
-			    autoplay: 0,
-			    egm: 1,
-			    fs: 1,
-			    showinfo: 0,
-			    wmode: 'opaque'
-			  }
-			}, settings),
-			videos	= [],
-			// accessory functions
-			buildUrl	= function () {
-				var base	= 'https://gdata.youtube.com/feeds/api/videos',
-					params	= [
-					  'alt=json',
-					  'orderby=' + options.orderBy,
-					  'start-index=' + options.startIndex,
-					  'max-results=' + options.maxResults,
-					  'callback=?'
-					];
-				if (options.username !== '') {
-					params.push('author=' + options.username);
-				} else if (options.query !== '') {
-					params.push('q=' + encodeURIComponent(options.query));
-				}
-				return base + '?' + params.join('&');
-			},
-			buildPlayer = function (id) {
-			  if (id.length > 0) {
-			    if (!$ytPlayer) {
-			      $ytPlayer = $('<iframe/>', {'class': 'yt-player'});
-			    }
-			    var src = 'http://www.youtube-nocookie.com/embed/' + id,
-			      opt;
-			    if (options.playerOpts) {
-            src += '?';
-            for (opt in options.playerOpts) {
-              if (options.playerOpts.hasOwnProperty(opt)) {
-                src += opt + '=' + options.playerOpts[opt] + '&';
-              }
-            }
-            src += '_a=b';
+
+  $.fn.ytChanPlayer = function (settings) {
+    var $ytEl = $(this),
+      $ytList = $('<ul/>', {'class': 'yt-channel-list'}),
+      $ytPlayer,
+      $ytPlayerWrapper,
+      options = $.extend({}, $.fn.ytChanPlayer.defaults, settings),
+      playerInitialized = false,
+      videos = [],
+
+    // Utility functions
+      buildYoutubeEmbedUrl = function (videoId) {
+        var url = 'http://www.youtube.com/embed/' + videoId;
+        if (options.playerOpts) {
+          url += '?' + $.param(options.playerOpts);
+        }
+        return url;
+      },
+
+      buildPlayer = function (videoId) {
+        if (videoId.length > 0) {
+          if (!$ytPlayer) {
+            $ytPlayerWrapper = $('<div/>', {class: 'yt-player-wrapper'});
+            $ytPlayer = $('<iframe/>', {class: 'yt-player'}).prependTo($ytPlayerWrapper);
+            $ytPlayerWrapper.prependTo($ytEl);
           }
-			    $ytPlayer.attr('src', src).prependTo($ytEl);
-			  }
-			},
-			zeroFill = function (number, width) {
-        width -= number.toString().length;
-        if (width > 0) {
-          return [width + (/\./.test(number) ? 2 : 1) ].join('0') + number;
+          $ytPlayer.attr('src', buildYoutubeEmbedUrl(videoId));
+          playerInitialized = true;
         }
-        return (number).toString();
       },
-			parseTime	= function (secs) {
-				var m, s = parseInt(secs, 10);
-				m = Math.floor(s / 60);
-				s -= (m * 60);
-				return m + ':' + zeroFill(s, 2);
-			};
-		// setup the html
-		$ytEl.addClass('yt-channel-holder');
-		$ytList.appendTo($ytEl);
-		// parse the feed
-		$.getJSON(buildUrl(), function (data) {
-		  var i, html, vid, e;
-			// add the header
-			if (data.feed.entry) {
-			  if (options.sticky) {
-			    buildPlayer(options.sticky);
-			  } else {
-			    buildPlayer(data.feed.entry[0].id.$t.match('[^/]*$'));
-			  }
-				// add the items
-				for (i = 0; i < data.feed.entry.length; i++) {
-					e = data.feed.entry[i];
-					vid = {
-						link: (e ? e.media$group.media$player[0].url : ''),
-						title: (e ? e.media$group.media$title.$t : ''),
-						thumb:	(e ? e.media$group.media$thumbnail[1].url : ''),
-						duration:	(e ? e.media$group.yt$duration.seconds : 0),
-						views: (e && e.yt$statistics ? e.yt$statistics.viewCount : 0),
-						id: (e ? e.id.$t.match('[^/]*$') : '')
-					};
-					html	= $('<li/>', {'class': 'yt-channel-video'})
-				    .html([
-					    '<a href="', vid.link, '" title="', vid.title, ' (', parseTime(vid.duration), ')" target="_blank">',
-					    '<img class="vid-thumb" alt="', vid.title, '" src="', vid.thumb, '"/>',
-					    '</a>'
-				    ].join(''))
-				    .data('id', vid.id).click(function (e) {
-				      e.preventDefault();
-				      options.playerOpts = $.extend(options.playerOpts, {autoplay: 1});
-				      buildPlayer($(this).data('id'));
-				    })
-				    .css('opacity', '.7')
-			      .hover(function () {
-			        $(this).stop().animate({
-			          opacity: '1'
-			        }, 400);
-			      }, function () {
-			        $(this).stop().animate({
-			          opacity: '.7'
-			        }, 200);
-			      });
-					videos.push(vid);
-					html.appendTo($ytList);
-				}
-			} else {
-				$('<li/>', {'class': 'yt-channel-video'})
-					.html('<a>NO RESULTS</a>').appendTo($ytList);
-			}
-		});
-		return this;
-	};
+
+      insertIntoPlaylist = function (videoObject) {
+        var $listItem, $anchor;
+        $listItem = $('<li/>', {'class': 'yt-channel-video'});
+
+        $anchor = $('<a/>', {
+          href: videoObject.embedUrl,
+          title: videoObject.title,
+          target: '_blank',
+          'data-id': videoObject.videoId
+        }).appendTo($listItem);
+
+        $('<img/>', {
+          class: 'vid-thumb',
+          alt: videoObject.title,
+          src: videoObject.thumbnail
+        }).appendTo($anchor);
+
+        $listItem.appendTo($ytList);
+        videos.push(videoObject);
+      },
+
+      hasNested = function (obj /*, level1, level2, ... levelN*/) {
+        var args = Array.prototype.slice.call(arguments, 1);
+
+        for (var i = 0; i < args.length; i++) {
+          if (!obj || !obj.hasOwnProperty(args[i])) {
+            return false;
+          }
+          obj = obj[args[i]];
+        }
+        return true;
+      };
+
+    // DOM Setup
+    $ytEl.addClass('yt-channel-holder');
+    $ytList.on('click', '.yt-channel-video a',function (e) {
+      e.preventDefault();
+      options.playerOpts = $.extend(options.playerOpts, {autoplay: 1});
+      buildPlayer($(this).data('id'));
+    }).appendTo($ytEl);
+
+    // Get channel data
+    $.get('https://www.googleapis.com/youtube/v3/channels', {
+      part: 'contentDetails',
+      key: options.apiKey,
+      forHandle: options.username
+    })
+      .then(function (res, textStatus, jqXHR) {
+        var req;
+        if (res.items && res.items[0] && hasNested(res.items[0], 'contentDetails', 'relatedPlaylists', 'uploads')) {
+          req = {
+            part: 'snippet',
+            key: options.apiKey,
+            playlistId: res.items[0].contentDetails.relatedPlaylists.uploads,
+            maxResults: options.maxResults
+          };
+          return $.get('https://www.googleapis.com/youtube/v3/playlistItems', req);
+        } else {
+          return $.Deferred().reject(res, 'Unable to fetch playlist items.', jqXHR).promise();
+        }
+      })
+      .then(function (res, textStatus, jqXHR) {
+        if (res.items && res.items.length) {
+          $.each(res.items, function (i, item) {
+            var video;
+            if (!hasNested(item, 'snippet', 'resourceId', 'videoId')) {
+              return true; // Skip to next item
+            }
+
+            video = {
+              videoId: item.snippet.resourceId.videoId,
+              title: item.snippet.title,
+              thumbnail: item.snippet.thumbnails.default.url
+            };
+            video.embedUrl = buildYoutubeEmbedUrl(video.id);
+
+            if (!playerInitialized) {
+              buildPlayer(options.sticky || item.snippet.resourceId.videoId);
+            }
+
+            insertIntoPlaylist(video);
+          });
+        } else {
+          return $.Deferred().reject(res, 'Unable to fetch playlist items.', jqXHR).promise();
+        }
+      })
+      .fail(function (res, textStatus, jqXHR) {
+        if (options.debug) {
+          console.log('Error: ' + textStatus);
+        }
+      });
+
+    return this;
+  };
+
+  $.fn.ytChanPlayer.defaults = {
+    apiKey: '',
+    username: '',
+    maxResults: 10,
+    debug: false,
+    playerOpts: {
+      autohide: 1,
+      autoplay: 0,
+      fs: 1,
+      showinfo: 0
+    }
+  };
+
 }(jQuery));
diff --git a/jquery.ytChanPlayer.min.js b/jquery.ytChanPlayer.min.js
index a9ba8d3..06f1330 100644
--- a/jquery.ytChanPlayer.min.js
+++ b/jquery.ytChanPlayer.min.js
@@ -1,6 +1,5 @@
-/* jQuery Youtube Channel Player 0.1.3
- * Author: Marc Loehe (boundaryfunctions)
- * Based on jQuery.youtubeChannel by Miguel Guerreiro (dharyk)
- * Licensed under the MIT license
+/* jQuery Youtube Channel Player 0.2.0
+ * Author: Marc Löhe <marc@marcloehe.de>
+ * Licensed under the MIT license.
  */
-(function(a){"use strict";a.fn.ytChanPlayer=function(b){var c=a(this),d,e=a("<ul/>",{"class":"yt-channel-list"}),f=a.extend({},{username:"",query:"",startIndex:1,maxResults:10,orderBy:"published",playerOpts:{autohide:1,autoplay:0,egm:1,fs:1,showinfo:0,wmode:"opaque"}},b),g=[],h=function(){var a="https://gdata.youtube.com/feeds/api/videos",b=["alt=json","orderby="+f.orderBy,"start-index="+f.startIndex,"max-results="+f.maxResults,"callback=?"];if(f.username!==""){b.push("author="+f.username)}else if(f.query!==""){b.push("q="+encodeURIComponent(f.query))}return a+"?"+b.join("&")},i=function(b){if(b.length>0){if(!d){d=a("<iframe/>",{"class":"yt-player"})}var e="http://www.youtube-nocookie.com/embed/"+b,g;if(f.playerOpts){e+="?";for(g in f.playerOpts){if(f.playerOpts.hasOwnProperty(g)){e+=g+"="+f.playerOpts[g]+"&"}}e+="_a=b"}d.attr("src",e).prependTo(c)}},j=function(a,b){b-=a.toString().length;if(b>0){return[b+(/\./.test(a)?2:1)].join("0")+a}return a.toString()},k=function(a){var b,c=parseInt(a,10);b=Math.floor(c/60);c-=b*60;return b+":"+j(c,2)};c.addClass("yt-channel-holder");e.appendTo(c);a.getJSON(h(),function(b){var c,d,h,j;if(b.feed.entry){if(f.sticky){i(f.sticky)}else{i(b.feed.entry[0].id.$t.match("[^/]*$"))}for(c=0;c<b.feed.entry.length;c++){j=b.feed.entry[c];h={link:j?j.media$group.media$player[0].url:"",title:j?j.media$group.media$title.$t:"",thumb:j?j.media$group.media$thumbnail[1].url:"",duration:j?j.media$group.yt$duration.seconds:0,views:j&&j.yt$statistics?j.yt$statistics.viewCount:0,id:j?j.id.$t.match("[^/]*$"):""};d=a("<li/>",{"class":"yt-channel-video"}).html(['<a href="',h.link,'" title="',h.title," (",k(h.duration),')" target="_blank">','<img class="vid-thumb" alt="',h.title,'" src="',h.thumb,'"/>',"</a>"].join("")).data("id",h.id).click(function(b){b.preventDefault();f.playerOpts=a.extend(f.playerOpts,{autoplay:1});i(a(this).data("id"))}).css("opacity",".7").hover(function(){a(this).stop().animate({opacity:"1"},400)},function(){a(this).stop().animate({opacity:".7"},200)});g.push(h);d.appendTo(e)}}else{a("<li/>",{"class":"yt-channel-video"}).html("<a>NO RESULTS</a>").appendTo(e)}});return this}})(jQuery)
+!function(e){"use strict";e.fn.ytChanPlayer=function(t){var a,n,s=e(this),l=e("<ul/>",{class:"yt-channel-list"}),i=e.extend({},e.fn.ytChanPlayer.defaults,t),r=!1,p=[],o=function(t){var a="http://www.youtube.com/embed/"+t;return i.playerOpts&&(a+="?"+e.param(i.playerOpts)),a},u=function(t){t.length>0&&(a||(n=e("<div/>",{class:"yt-player-wrapper"}),a=e("<iframe/>",{class:"yt-player"}).prependTo(n),n.prependTo(s)),a.attr("src",o(t)),r=!0)},d=function(e){for(var t=Array.prototype.slice.call(arguments,1),a=0;a<t.length;a++){if(!e||!e.hasOwnProperty(t[a]))return!1;e=e[t[a]]}return!0};return s.addClass("yt-channel-holder"),l.on("click",".yt-channel-video a",function(t){t.preventDefault(),i.playerOpts=e.extend(i.playerOpts,{autoplay:1}),u(e(this).data("id"))}).appendTo(s),e.get("https://www.googleapis.com/youtube/v3/channels",{part:"contentDetails",key:i.apiKey,forHandle:i.username}).then(function(t,a,n){var s;return t.items&&t.items[0]&&d(t.items[0],"contentDetails","relatedPlaylists","uploads")?(s={part:"snippet",key:i.apiKey,playlistId:t.items[0].contentDetails.relatedPlaylists.uploads,maxResults:i.maxResults},e.get("https://www.googleapis.com/youtube/v3/playlistItems",s)):e.Deferred().reject(t,"Unable to fetch playlist items.",n).promise()}).then(function(t,a,n){if(!t.items||!t.items.length)return e.Deferred().reject(t,"Unable to fetch playlist items.",n).promise();e.each(t.items,function(t,a){var n,s,c,y;if(!d(a,"snippet","resourceId","videoId"))return!0;(n={videoId:a.snippet.resourceId.videoId,title:a.snippet.title,thumbnail:a.snippet.thumbnails.default.url}).embedUrl=o(n.id),r||u(i.sticky||a.snippet.resourceId.videoId),s=n,c=e("<li/>",{class:"yt-channel-video"}),y=e("<a/>",{href:s.embedUrl,title:s.title,target:"_blank","data-id":s.videoId}).appendTo(c),e("<img/>",{class:"vid-thumb",alt:s.title,src:s.thumbnail}).appendTo(y),c.appendTo(l),p.push(s)})}).fail(function(e,t,a){i.debug&&console.log("Error: "+t)}),this},e.fn.ytChanPlayer.defaults={apiKey:"",username:"",maxResults:10,debug:!1,playerOpts:{autohide:1,autoplay:0,fs:1,showinfo:0}}}(jQuery);