diff --git a/dist/videojs.ga.videocloud.js b/dist/videojs.ga.videocloud.js
index 9a54697..27cab74 100644
--- a/dist/videojs.ga.videocloud.js
+++ b/dist/videojs.ga.videocloud.js
@@ -1,13 +1,16 @@
 /*
-* videojs-ga-videocloud - v0.4.2 - 2016-08-24
+* videojs-ga-videocloud - v0.4.2 - 2018-10-07
 * Based on videojs-ga 0.4.2
-* Copyright (c) 2016 Michael Bensoussan
+* Copyright (c) 2018 Michael Bensoussan
 * Licensed MIT
 */
 (function() {
-  var __indexOf = [].indexOf || function(item) { for (var i = 0, l = this.length; i < l; i++) { if (i in this && this[i] === item) return i; } return -1; };
+  var registerPlugin,
+    __indexOf = [].indexOf || function(item) { for (var i = 0, l = this.length; i < l; i++) { if (i in this && this[i] === item) return i; } return -1; };
 
-  videojs.plugin('ga', function(options) {
+  registerPlugin = videojs.registerPlugin || videojs.plugin;
+
+  registerPlugin('ga', function(options) {
     var adStateRegex, currentVideo, dataSetupOptions, defaultLabel, defaultsEventsToTrack, end, endTracked, error, eventCategory, eventLabel, eventNames, eventsToTrack, fullscreen, getEventName, isInAdState, loaded, parsedOptions, pause, percentsAlreadyTracked, percentsPlayedInterval, play, player, referrer, resize, seekEnd, seekStart, seeking, sendbeacon, sendbeaconOverride, start, startTracked, timeupdate, tracker, trackerName, volumeChange,
       _this = this;
     if (options == null) {
@@ -21,7 +24,7 @@
     }
     player = this;
     dataSetupOptions = {};
-    if (this.options()["data-setup"]) {
+    if (this.options_["data-setup"]) {
       parsedOptions = JSON.parse(this.options()["data-setup"]);
       if (parsedOptions.ga) {
         dataSetupOptions = parsedOptions.ga;
diff --git a/dist/videojs.ga.videocloud.min.js b/dist/videojs.ga.videocloud.min.js
index be332f3..7f94fab 100644
--- a/dist/videojs.ga.videocloud.min.js
+++ b/dist/videojs.ga.videocloud.min.js
@@ -1,7 +1,7 @@
 /*
-* videojs-ga-videocloud - v0.4.2 - 2016-08-24
+* videojs-ga-videocloud - v0.4.2 - 2018-10-07
 * Based on videojs-ga 0.4.2
-* Copyright (c) 2016 Michael Bensoussan
+* Copyright (c) 2018 Michael Bensoussan
 * Licensed MIT
 */
-(function(){var a=[].indexOf||function(a){for(var b=0,c=this.length;c>b;b++)if(b in this&&this[b]===a)return b;return-1};videojs.plugin("ga",function(b){var c,d,e,f,g,h,i,j,k,l,m,n,o,p,q,r,s,t,u,v,w,x,y,z,A,B,C,D,E,F,G,H,I,J,K;return null==b&&(b={}),y=document.createElement("a"),y.href=document.referrer,self!==top&&"preview-players.brightcove.net"===window.location.host&&"studio.brightcove.com"===y.hostname?void videojs.log("Google analytics plugin will not track events in Video Cloud Studio"):(x=this,e={},this.options()["data-setup"]&&(s=JSON.parse(this.options()["data-setup"]),s.ga&&(e=s.ga)),g=["player_load","video_load","percent_played","start","end","seek","play","pause","resize","volume_change","error","fullscreen"],n=b.eventsToTrack||e.eventsToTrack||g,v=b.percentsPlayedInterval||e.percentsPlayedInterval||10,k=b.eventCategory||e.eventCategory||"Brightcove Player",f=b.eventLabel||e.eventLabel,E=b.sendbeaconOverride||!1,b.debug=b.debug||!1,b.trackerName=b.trackerName||null,J="","string"==typeof b.trackerName&&(J=b.trackerName+"."),u=[],G=!1,i=!1,B=A=0,C=!1,l="",d="",m={video_load:"Video Load",percent_played:"Percent played",start:"Media Begin",seek_start:"Seek start",seek_end:"Seek end",play:"Media Play",pause:"Media Pause",error:"Error",fullscreen_exit:"Fullscreen Exited",fullscreen_enter:"Fullscreen Entered",resize:"Resize",volume_change:"Volume Change",player_load:"Player Load",end:"Media Complete"},p=function(a){return b.eventNames&&b.eventNames[a]?b.eventNames[a]:e.eventNames&&e.eventNames[a]?e.eventNames[a]:m[a]?m[a]:a},("players.brightcove.net"===window.location.host||"preview-players.brightcove.net"===window.location.host||""!==J)&&(I=b.tracker||e.tracker,I&&(!function(a,b,c,d,e,f,g){return a.GoogleAnalyticsObject=e,a[e]=a[e]||function(){return(a[e].q=a[e].q||[]).push(arguments)},a[e].l=1*new Date,f=b.createElement(c),g=b.getElementsByTagName(c)[0],f.async=1,f.src=d,g.parentNode.insertBefore(f,g)}(window,document,"script","//www.google-analytics.com/analytics.js","ga"),ga("create",I,"auto",b.trackerName),ga(J+"require","displayfeatures"))),c=/(\s|^)vjs-ad-(playing|loading)(\s|$)/,q=function(a){return c.test(a.el().className)},r=function(){q(x)||(l=f?f:x.mediainfo&&x.mediainfo.id?x.mediainfo.id+" | "+x.mediainfo.name:this.currentSrc().split("/").slice(-1)[0].replace(/\.(\w{3,4})(\?.*)?$/i,""),x.mediainfo&&x.mediainfo.id&&x.mediainfo.id!==d&&(d=x.mediainfo.id,u=[],G=!1,i=!1,B=A=0,C=!1,a.call(n,"video_load")>=0&&D(p("video_load"),!0)))},H=function(){var b,c,d,e,f;if(!q(x)){for(b=Math.round(this.currentTime()),c=Math.round(this.duration()),e=Math.round(b/c*100),d=f=0;99>=f;d=f+=v)e>=d&&a.call(u,d)<0&&(a.call(n,"percent_played")>=0&&0!==e&&D(p("percent_played"),!0,d),e>0&&u.push(d));a.call(n,"seek")>=0&&(B=A,A=b,Math.abs(B-A)>1&&(C=!0,D(p("seek_start"),!1,B),D(p("seek_end"),!1,A)))}},h=function(){q(x)||i||(D(p("end"),!0),i=!0)},w=function(){var a;q(x)||(a=Math.round(this.currentTime()),D(p("play"),!0,a),C=!1)},F=function(){return!q(x)&&a.call(n,"start")>=0&&!G?(D(p("start"),!0),G=!0):void 0},t=function(){var a,b;q(x)||(a=Math.round(this.currentTime()),b=Math.round(this.duration()),a===b||C||D(p("pause"),!0,a))},K=function(){var a;a=this.muted()===!0?0:this.volume(),D(p("volume_change"),!1,a)},z=function(){D(p("resize")+" - "+this.width()+"*"+this.height(),!0)},j=function(){var a;a=Math.round(this.currentTime()),D(p("error"),!0,a)},o=function(){var a;a=Math.round(this.currentTime()),this.isFullscreen()?D(p("fullscreen_enter"),!1,a):D(p("fullscreen_exit"),!1,a)},D=function(a,c,d){E?E(k,a,l,d,c):window.ga?ga(J+"send","event",{eventCategory:k,eventAction:a,eventLabel:l,eventValue:d,nonInteraction:c}):window._gaq?_gaq.push(["_trackEvent",k,a,l,d,c]):b.debug&&videojs.log("Google Analytics not detected")},this.ready(function(){var b,c;return this.on("loadedmetadata",r),this.on("timeupdate",H),a.call(n,"end")>=0&&this.on("ended",h),a.call(n,"play")>=0&&this.on("play",w),a.call(n,"start")>=0&&this.on("playing",F),a.call(n,"pause")>=0&&this.on("pause",t),a.call(n,"volume_change")>=0&&this.on("volumechange",K),a.call(n,"resize")>=0&&this.on("resize",z),a.call(n,"error")>=0&&this.on("error",j),a.call(n,"fullscreen")>=0&&this.on("fullscreenchange",o),a.call(n,"player_load")>=0?(self!==top?(b=document.referrer,c=1):(b=window.location.href,c=0),E?E(k,p("player_load"),b,c,!0):window.ga?ga(J+"send","event",{eventCategory:k,eventAction:p("player_load"),eventLabel:b,eventValue:c,nonInteraction:!0}):window._gaq?_gaq.push(["_trackEvent",k,p("player_load"),b,c,!1]):videojs.log("Google Analytics not detected")):void 0}),{sendbeacon:D})})}).call(this);
\ No newline at end of file
+(function(){var $=[].indexOf||function(e){for(var t=0,n=this.length;t<n;t++)if(t in this&&this[t]===e)return t;return-1};(videojs.registerPlugin||videojs.plugin)("ga",function(a){var t,e,n,r,i,o,l,s,c,d,u,h,v,g,p,f,m,y,_,w,k,b,N,M,T,j,E,P,q,C,z,L,A,S,V,x,B,G,I,O,F;if(null==a&&(a={}),(N=document.createElement("a")).href=document.referrer,self===top||"preview-players.brightcove.net"!==window.location.host||"studio.brightcove.com"!==N.hostname)return n={},(b=this).options_["data-setup"]&&(m=JSON.parse(this.options()["data-setup"])).ga&&(n=m.ga),i=["player_load","video_load","percent_played","start","end","seek","play","pause","resize","volume_change","error","fullscreen"],h=a.eventsToTrack||n.eventsToTrack||i,w=a.percentsPlayedInterval||n.percentsPlayedInterval||10,c=a.eventCategory||n.eventCategory||"Brightcove Player",r=a.eventLabel||n.eventLabel,q=a.sendbeaconOverride||!1,a.debug=a.debug||!1,a.trackerName=a.trackerName||null,S="","string"==typeof a.trackerName&&(S=a.trackerName+"."),j=T=0,E=l=z=!(_=[]),e=d="",u={video_load:"Video Load",percent_played:"Percent played",start:"Media Begin",seek_start:"Seek start",seek_end:"Seek end",play:"Media Play",pause:"Media Pause",error:"Error",fullscreen_exit:"Fullscreen Exited",fullscreen_enter:"Fullscreen Entered",resize:"Resize",volume_change:"Volume Change",player_load:"Player Load",end:"Media Complete"},g=function(e){return a.eventNames&&a.eventNames[e]?a.eventNames[e]:n.eventNames&&n.eventNames[e]?n.eventNames[e]:u[e]?u[e]:e},"players.brightcove.net"!==window.location.host&&"preview-players.brightcove.net"!==window.location.host&&""===S||(A=a.tracker||n.tracker)&&(x=window,B=document,G="script",I="ga",x.GoogleAnalyticsObject=I,x.ga=x.ga||function(){return(x.ga.q=x.ga.q||[]).push(arguments)},x.ga.l=1*new Date,O=B.createElement(G),F=B.getElementsByTagName(G)[0],O.async=1,O.src="//www.google-analytics.com/analytics.js",F.parentNode.insertBefore(O,F),ga("create",A,"auto",a.trackerName),ga(S+"require","displayfeatures")),t=/(\s|^)vjs-ad-(playing|loading)(\s|$)/,p=function(e){return t.test(e.el().className)},f=function(){p(b)||(d=r||(b.mediainfo&&b.mediainfo.id?b.mediainfo.id+" | "+b.mediainfo.name:this.currentSrc().split("/").slice(-1)[0].replace(/\.(\w{3,4})(\?.*)?$/i,"")),b.mediainfo&&b.mediainfo.id&&b.mediainfo.id!==e&&(e=b.mediainfo.id,j=T=0,E=l=z=!(_=[]),0<=$.call(h,"video_load")&&P(g("video_load"),!0)))},L=function(){var e,t,n,a,r;if(!p(b)){for(e=Math.round(this.currentTime()),t=Math.round(this.duration()),a=Math.round(e/t*100),n=r=0;r<=99;n=r+=w)n<=a&&$.call(_,n)<0&&(0<=$.call(h,"percent_played")&&0!==a&&P(g("percent_played"),!0,n),0<a&&_.push(n));0<=$.call(h,"seek")&&(j=T,T=e,1<Math.abs(j-T)&&(E=!0,P(g("seek_start"),!1,j),P(g("seek_end"),!1,T)))}},o=function(){p(b)||l||(P(g("end"),!0),l=!0)},k=function(){var e;p(b)||(e=Math.round(this.currentTime()),P(g("play"),!0,e),E=!1)},C=function(){if(!p(b)&&0<=$.call(h,"start")&&!z)return P(g("start"),!0),z=!0},y=function(){var e;p(b)||(e=Math.round(this.currentTime()))===Math.round(this.duration())||E||P(g("pause"),!0,e)},V=function(){var e;e=!0===this.muted()?0:this.volume(),P(g("volume_change"),!1,e)},M=function(){P(g("resize")+" - "+this.width()+"*"+this.height(),!0)},s=function(){var e;e=Math.round(this.currentTime()),P(g("error"),!0,e)},v=function(){var e;e=Math.round(this.currentTime()),this.isFullscreen()?P(g("fullscreen_enter"),!1,e):P(g("fullscreen_exit"),!1,e)},P=function(e,t,n){q?q(c,e,d,n,t):window.ga?ga(S+"send","event",{eventCategory:c,eventAction:e,eventLabel:d,eventValue:n,nonInteraction:t}):window._gaq?_gaq.push(["_trackEvent",c,e,d,n,t]):a.debug&&videojs.log("Google Analytics not detected")},this.ready(function(){var e,t;if(this.on("loadedmetadata",f),this.on("timeupdate",L),0<=$.call(h,"end")&&this.on("ended",o),0<=$.call(h,"play")&&this.on("play",k),0<=$.call(h,"start")&&this.on("playing",C),0<=$.call(h,"pause")&&this.on("pause",y),0<=$.call(h,"volume_change")&&this.on("volumechange",V),0<=$.call(h,"resize")&&this.on("resize",M),0<=$.call(h,"error")&&this.on("error",s),0<=$.call(h,"fullscreen")&&this.on("fullscreenchange",v),0<=$.call(h,"player_load"))return t=self!==top?(e=document.referrer,1):(e=window.location.href,0),q?q(c,g("player_load"),e,t,!0):window.ga?ga(S+"send","event",{eventCategory:c,eventAction:g("player_load"),eventLabel:e,eventValue:t,nonInteraction:!0}):window._gaq?_gaq.push(["_trackEvent",c,g("player_load"),e,t,!1]):videojs.log("Google Analytics not detected")}),{sendbeacon:P};videojs.log("Google analytics plugin will not track events in Video Cloud Studio")})}).call(this);
\ No newline at end of file
diff --git a/src/videojs.ga.coffee b/src/videojs.ga.coffee
index 9e3dfd5..78e1ea5 100644
--- a/src/videojs.ga.coffee
+++ b/src/videojs.ga.coffee
@@ -6,7 +6,9 @@
 # Licensed under the MIT license.
 ##
 
-videojs.plugin 'ga', (options = {}) ->
+registerPlugin = videojs.registerPlugin || videojs.plugin;
+
+registerPlugin 'ga', (options = {}) ->
 
   referrer = document.createElement('a')
   referrer.href = document.referrer
@@ -18,7 +20,7 @@ videojs.plugin 'ga', (options = {}) ->
 
   # this loads options from the data-setup attribute of the video tag
   dataSetupOptions = {}
-  if @options()["data-setup"]
+  if @options_["data-setup"]
     parsedOptions = JSON.parse(@options()["data-setup"])
     dataSetupOptions = parsedOptions.ga if parsedOptions.ga