diff --git a/.jshintrc b/.jshintrc
index 35793b5..c792b75 100644
--- a/.jshintrc
+++ b/.jshintrc
@@ -1,7 +1,7 @@
 {
   "node": true,
   "browser": true,
-  "es5": true,
+  "es5": false,
   "esnext": true,
   "bitwise": true,
   "camelcase": true,
diff --git a/dist/angular-mapbox.js b/dist/angular-mapbox.js
index 9fc8c73..b3892a7 100644
--- a/dist/angular-mapbox.js
+++ b/dist/angular-mapbox.js
@@ -228,8 +228,8 @@
         var style = setStyleOptions(attrs);
         var marker;
 
-        function setStyleOptions(attrs, default_opts) {
-          var opts = default_opts || {};
+        function setStyleOptions(attrs, defaultOpts) {
+          var opts = defaultOpts || {};
           if(attrs.size) {
             opts['marker-size'] = attrs.size;
           }
@@ -250,7 +250,9 @@
           opts = opts || {};
 
           var marker = L.mapbox.marker.style({ properties: style }, latlng);
-          if(popupContent && popupContent.length > 0) marker.bindPopup(popupContent);
+          if(popupContent && popupContent.length > 0) {
+            marker.bindPopup(popupContent);
+          }
 
           if(controller.$scope.isClusteringMarkers && opts.excludeFromClustering !== true) {
             controller.$scope.clusterGroup.addLayer(marker);
@@ -260,7 +262,9 @@
 
           // this needs to come after being added to map because the L.mapbox.marker.style() factory
           // does not let us pass other opts (eg, draggable) in
-          if(opts.draggable) marker.dragging.enable();
+          if(opts.draggable) {
+            marker.dragging.enable();
+          }
 
           mapboxService.addMarker(marker);
           //mapboxService.fitMapToMarkers(map); // TODO: debounce this
@@ -280,11 +284,13 @@
         };
 
         controller.getMap().then(function(map) {
-          map.on('popupopen', function(e) {
+          map.on('popupopen', function() {
             // ensure that popups are compiled
             var popup = angular.element(document.getElementsByClassName('leaflet-popup-content'));
             $compile(popup)(scope);
-            if(!scope.$$phase) scope.$digest();
+            if(!scope.$$phase) {
+              scope.$digest();
+            }
           });
 
           setTimeout(function() {
@@ -292,7 +298,9 @@
             var popupHTML = '';
             var transcluded = transclude(scope, function() {});
             for(var i = 0; i < transcluded.length; i++) {
-              if(transcluded[i].outerHTML !== undefined) popupHTML += transcluded[i].outerHTML;
+              if(transcluded[i].outerHTML !== undefined) {
+                popupHTML += transcluded[i].outerHTML;
+              }
             }
 
             if(attrs.currentLocation !== undefined) {
@@ -301,7 +309,9 @@
               if(popupHTML) {
                 var popup = angular.element(popupHTML);
                 $compile(popup)(scope);
-                if(!scope.$$phase) scope.$digest();
+                if(!scope.$$phase) {
+                  scope.$digest();
+                }
 
                 var newPopupHTML = '';
                 for(i = 0; i < popup.length; i++) {
diff --git a/dist/angular-mapbox.min.js b/dist/angular-mapbox.min.js
index 7d4c280..1e77760 100644
--- a/dist/angular-mapbox.min.js
+++ b/dist/angular-mapbox.min.js
@@ -1 +1 @@
-!function(){"use strict";angular.module("angular-mapbox",[])}(),function(){"use strict";function mapboxService(){function init(opts){if(!opts.accessToken)throw"MissingMapboxApiToken";L.mapbox.accessToken=opts.accessToken}function addMapInstance(map,mapOptions){mapOptions=mapOptions||{},_mapInstances.push(map),_mapOptions.push(mapOptions),_markers.push([])}function getMapInstances(){return _mapInstances}function addMarker(marker){var map=getMapInstances()[0];_markers[0].push(marker);var opts=getOptionsForMap(map);opts.scaleToFit&&fitMapToMarkers(map)}function debounce(func,wait,immediate){var timeout;return function(){var context=this,args=arguments,later=function(){timeout=null,immediate||func.apply(context,args)},callNow=immediate&&!timeout;clearTimeout(timeout),timeout=setTimeout(later,wait),callNow&&func.apply(context,args)}}function getMarkers(){return _markers[0]}function getOptionsForMap(){return _mapOptions[0]}var _mapInstances=[],_markers=[],_mapOptions=[],fitMapToMarkers=debounce(function(){var map=_mapInstances[0],group=new L.featureGroup(getMarkers());map.fitBounds(group.getBounds())},0),service={init:init,getMapInstances:getMapInstances,addMapInstance:addMapInstance,getMarkers:getMarkers,addMarker:addMarker,fitMapToMarkers:fitMapToMarkers};return service}angular.module("angular-mapbox").service("mapboxService",mapboxService)}(),function(){"use strict";angular.module("angular-mapbox").directive("featureLayer",function(){return{restrict:"E",require:"^mapbox",link:function(scope,element,attrs,controller){attrs.data?controller.getMap().then(function(map){var geojsonObject=scope.$eval(attrs.data),featureLayer=L.mapbox.featureLayer(geojsonObject).addTo(map);controller.$scope.featureLayers.push(featureLayer)}):attrs.url&&controller.getMap().then(function(map){var featureLayer=L.mapbox.featureLayer().addTo(map);featureLayer.loadURL(attrs.url),controller.$scope.featureLayers.push(featureLayer)})}}})}(),function(){"use strict";angular.module("angular-mapbox").directive("mapbox",["$compile","$q","mapboxService",function($compile,$q,mapboxService){var _mapboxMap;return{restrict:"E",transclude:!0,scope:!0,replace:!0,link:function(scope,element,attrs){scope.map=L.mapbox.map(element[0],attrs.mapId),_mapboxMap.resolve(scope.map);var mapOptions={clusterMarkers:void 0!==attrs.clusterMarkers,scaleToFit:void 0!==attrs.scaleToFit};mapboxService.addMapInstance(scope.map,mapOptions);var mapWidth=attrs.width||500,mapHeight=attrs.height||500;element.css("width",mapWidth+"px"),element.css("height",mapHeight+"px");var zoom=attrs.zoom||12;attrs.lat&&attrs.lng&&scope.map.setView([attrs.lat,attrs.lng],zoom),scope.isClusteringMarkers=void 0!==attrs.clusterMarkers,attrs.onReposition&&scope.map.on("dragend",function(){scope[attrs.onReposition](scope.map.getBounds())}),attrs.onZoom&&scope.map.on("zoomend",function(){scope[attrs.onZoom](scope.map.getBounds())})},template:'<div class="angular-mapbox-map" ng-transclude></div>',controller:["$scope","mapboxService",function($scope,mapboxService){$scope.markers=mapboxService.getMarkers(),$scope.featureLayers=[],_mapboxMap=$q.defer(),$scope.getMap=this.getMap=function(){return _mapboxMap.promise},L.MarkerClusterGroup&&($scope.clusterGroup=new L.MarkerClusterGroup,this.getMap().then(function(map){map.addLayer($scope.clusterGroup)})),this.$scope=$scope}]}}])}(),function(){"use strict";angular.module("angular-mapbox").directive("marker",["$compile","mapboxService",function($compile,mapboxService){var _colors={navy:"#001f3f",blue:"#0074d9",aqua:"#7fdbff",teal:"#39cccc",olive:"#3d9970",green:"#2ecc40",lime:"#01ff70",yellow:"#ffdc00",orange:"#ff851b",red:"#ff4136",fuchsia:"#f012be",purple:"#b10dc9",maroon:"#85144b",white:"white",silver:"#dddddd",gray:"#aaaaaa",black:"#111111"};return{restrict:"E",require:"^mapbox",transclude:!0,scope:!0,link:function(scope,element,attrs,controller,transclude){function setStyleOptions(attrs,default_opts){var opts=default_opts||{};return attrs.size&&(opts["marker-size"]=attrs.size),attrs.color&&(opts["marker-color"]="#"===attrs.color[0]?attrs.color:_colors[attrs.color]||attrs.color),attrs.icon&&(opts["marker-symbol"]=attrs.icon),opts}var marker,opts={draggable:void 0!==attrs.draggable},style=setStyleOptions(attrs),addMarker=function(map,latlng,popupContent,opts,style){opts=opts||{};var marker=L.mapbox.marker.style({properties:style},latlng);return popupContent&&popupContent.length>0&&marker.bindPopup(popupContent),controller.$scope.isClusteringMarkers&&opts.excludeFromClustering!==!0?controller.$scope.clusterGroup.addLayer(marker):marker.addTo(map),opts.draggable&&marker.dragging.enable(),mapboxService.addMarker(marker),marker},addCurrentLocation=function(map,popupContent,opts,style){style=setStyleOptions(style,{"marker-color":"#000","marker-symbol":"star"}),opts.excludeFromClustering=!0,map.on("locationfound",function(e){marker=addMarker(map,[e.latlng.lat,e.latlng.lng],null,opts,style)}),map.locate()};controller.getMap().then(function(map){map.on("popupopen",function(){var popup=angular.element(document.getElementsByClassName("leaflet-popup-content"));$compile(popup)(scope),scope.$$phase||scope.$digest()}),setTimeout(function(){for(var popupHTML="",transcluded=transclude(scope,function(){}),i=0;i<transcluded.length;i++)void 0!==transcluded[i].outerHTML&&(popupHTML+=transcluded[i].outerHTML);if(void 0!==attrs.currentLocation)addCurrentLocation(map,null,opts,style);else{if(popupHTML){var popup=angular.element(popupHTML);$compile(popup)(scope),scope.$$phase||scope.$digest();var newPopupHTML="";for(i=0;i<popup.length;i++)newPopupHTML+=popup[i].outerHTML;marker=addMarker(map,[attrs.lat,attrs.lng],newPopupHTML,opts,style)}else marker=addMarker(map,[attrs.lat,attrs.lng],null,opts,style);element.bind("$destroy",function(){controller.$scope.isClusteringMarkers?controller.$scope.clusterGroup.removeLayer(marker):map.removeLayer(marker)})}},0)})}}}])}();
\ No newline at end of file
+!function(){"use strict";angular.module("angular-mapbox",[])}(),function(){"use strict";function mapboxService(){function init(opts){if(!opts.accessToken)throw"MissingMapboxApiToken";L.mapbox.accessToken=opts.accessToken}function addMapInstance(map,mapOptions){mapOptions=mapOptions||{},_mapInstances.push(map),_mapOptions.push(mapOptions),_markers.push([])}function getMapInstances(){return _mapInstances}function addMarker(marker){var map=getMapInstances()[0];_markers[0].push(marker);var opts=getOptionsForMap(map);opts.scaleToFit&&fitMapToMarkers(map)}function debounce(func,wait,immediate){var timeout;return function(){var context=this,args=arguments,later=function(){timeout=null,immediate||func.apply(context,args)},callNow=immediate&&!timeout;clearTimeout(timeout),timeout=setTimeout(later,wait),callNow&&func.apply(context,args)}}function getMarkers(){return _markers[0]}function getOptionsForMap(){return _mapOptions[0]}var _mapInstances=[],_markers=[],_mapOptions=[],fitMapToMarkers=debounce(function(){var map=_mapInstances[0],group=new L.featureGroup(getMarkers());map.fitBounds(group.getBounds())},0),service={init:init,getMapInstances:getMapInstances,addMapInstance:addMapInstance,getMarkers:getMarkers,addMarker:addMarker,fitMapToMarkers:fitMapToMarkers};return service}angular.module("angular-mapbox").service("mapboxService",mapboxService)}(),function(){"use strict";angular.module("angular-mapbox").directive("featureLayer",function(){return{restrict:"E",require:"^mapbox",link:function(scope,element,attrs,controller){attrs.data?controller.getMap().then(function(map){var geojsonObject=scope.$eval(attrs.data),featureLayer=L.mapbox.featureLayer(geojsonObject).addTo(map);controller.$scope.featureLayers.push(featureLayer)}):attrs.url&&controller.getMap().then(function(map){var featureLayer=L.mapbox.featureLayer().addTo(map);featureLayer.loadURL(attrs.url),controller.$scope.featureLayers.push(featureLayer)})}}})}(),function(){"use strict";angular.module("angular-mapbox").directive("mapbox",["$compile","$q","mapboxService",function($compile,$q,mapboxService){var _mapboxMap;return{restrict:"E",transclude:!0,scope:!0,replace:!0,link:function(scope,element,attrs){scope.map=L.mapbox.map(element[0],attrs.mapId),_mapboxMap.resolve(scope.map);var mapOptions={clusterMarkers:void 0!==attrs.clusterMarkers,scaleToFit:void 0!==attrs.scaleToFit};mapboxService.addMapInstance(scope.map,mapOptions);var mapWidth=attrs.width||500,mapHeight=attrs.height||500;element.css("width",mapWidth+"px"),element.css("height",mapHeight+"px");var zoom=attrs.zoom||12;attrs.lat&&attrs.lng&&scope.map.setView([attrs.lat,attrs.lng],zoom),scope.isClusteringMarkers=void 0!==attrs.clusterMarkers,attrs.onReposition&&scope.map.on("dragend",function(){scope[attrs.onReposition](scope.map.getBounds())}),attrs.onZoom&&scope.map.on("zoomend",function(){scope[attrs.onZoom](scope.map.getBounds())})},template:'<div class="angular-mapbox-map" ng-transclude></div>',controller:["$scope","mapboxService",function($scope,mapboxService){$scope.markers=mapboxService.getMarkers(),$scope.featureLayers=[],_mapboxMap=$q.defer(),$scope.getMap=this.getMap=function(){return _mapboxMap.promise},L.MarkerClusterGroup&&($scope.clusterGroup=new L.MarkerClusterGroup,this.getMap().then(function(map){map.addLayer($scope.clusterGroup)})),this.$scope=$scope}]}}])}(),function(){"use strict";angular.module("angular-mapbox").directive("marker",["$compile","mapboxService",function($compile,mapboxService){var _colors={navy:"#001f3f",blue:"#0074d9",aqua:"#7fdbff",teal:"#39cccc",olive:"#3d9970",green:"#2ecc40",lime:"#01ff70",yellow:"#ffdc00",orange:"#ff851b",red:"#ff4136",fuchsia:"#f012be",purple:"#b10dc9",maroon:"#85144b",white:"white",silver:"#dddddd",gray:"#aaaaaa",black:"#111111"};return{restrict:"E",require:"^mapbox",transclude:!0,scope:!0,link:function(scope,element,attrs,controller,transclude){function setStyleOptions(attrs,defaultOpts){var opts=defaultOpts||{};return attrs.size&&(opts["marker-size"]=attrs.size),attrs.color&&(opts["marker-color"]="#"===attrs.color[0]?attrs.color:_colors[attrs.color]||attrs.color),attrs.icon&&(opts["marker-symbol"]=attrs.icon),opts}var marker,opts={draggable:void 0!==attrs.draggable},style=setStyleOptions(attrs),addMarker=function(map,latlng,popupContent,opts,style){opts=opts||{};var marker=L.mapbox.marker.style({properties:style},latlng);return popupContent&&popupContent.length>0&&marker.bindPopup(popupContent),controller.$scope.isClusteringMarkers&&opts.excludeFromClustering!==!0?controller.$scope.clusterGroup.addLayer(marker):marker.addTo(map),opts.draggable&&marker.dragging.enable(),mapboxService.addMarker(marker),marker},addCurrentLocation=function(map,popupContent,opts,style){style=setStyleOptions(style,{"marker-color":"#000","marker-symbol":"star"}),opts.excludeFromClustering=!0,map.on("locationfound",function(e){marker=addMarker(map,[e.latlng.lat,e.latlng.lng],null,opts,style)}),map.locate()};controller.getMap().then(function(map){map.on("popupopen",function(){var popup=angular.element(document.getElementsByClassName("leaflet-popup-content"));$compile(popup)(scope),scope.$$phase||scope.$digest()}),setTimeout(function(){for(var popupHTML="",transcluded=transclude(scope,function(){}),i=0;i<transcluded.length;i++)void 0!==transcluded[i].outerHTML&&(popupHTML+=transcluded[i].outerHTML);if(void 0!==attrs.currentLocation)addCurrentLocation(map,null,opts,style);else{if(popupHTML){var popup=angular.element(popupHTML);$compile(popup)(scope),scope.$$phase||scope.$digest();var newPopupHTML="";for(i=0;i<popup.length;i++)newPopupHTML+=popup[i].outerHTML;marker=addMarker(map,[attrs.lat,attrs.lng],newPopupHTML,opts,style)}else marker=addMarker(map,[attrs.lat,attrs.lng],null,opts,style);element.bind("$destroy",function(){controller.$scope.isClusteringMarkers?controller.$scope.clusterGroup.removeLayer(marker):map.removeLayer(marker)})}},0)})}}}])}();
\ No newline at end of file
diff --git a/examples/example-app.js b/examples/example-app.js
index 5beecd2..1c6a3d3 100644
--- a/examples/example-app.js
+++ b/examples/example-app.js
@@ -3,8 +3,12 @@
 
   var angularMapboxExample = angular.module('angular-mapbox-example', ['angular-mapbox']);
 
-  angularMapboxExample.controller('demoController', function($scope, mapboxService) {
+  angularMapboxExample.controller('demoController', function($scope, $timeout, mapboxService) {
     mapboxService.init({ accessToken: 'pk.eyJ1IjoibGljeWV1cyIsImEiOiJuZ1gtOWtjIn0.qaaGvywaJ_kCmwmlTSNyVw' });
+    $timeout(function() {
+      var map = mapboxService.getMapInstances()[0];
+      //mapboxService.fitMapToMarkers(map);
+    }, 100);
 
     $scope.farmersMarkets = [
       {
@@ -82,7 +86,7 @@
 
     $scope.mapZoomedCallback = function(bounds) {
       console.log('You zoomed the map to:');
-      console.log(bounds);
+      console.log(bounds.getCenter().toString());
     };
   });
 
diff --git a/examples/index.html b/examples/index.html
index cd6df9a..4d0b934 100644
--- a/examples/index.html
+++ b/examples/index.html
@@ -8,11 +8,20 @@
   <link rel="stylesheet" href="lib/MarkerCluster.Default.css">
 </head>
 <body ng-app="angular-mapbox-example" ng-controller="demoController">
-  <mapbox map-id="licyeus.i9pkgkg8"
+  <input type="text" ng-model="status">
+  {{ status }}
+  <mapbox map-id="licyeus.XXXi9pkgkg8"
           lat="47.643569"
           lng="-122.329453"
           on-reposition="mapMovedCallback"
-          on-zoom="mapZoomedCallback">
+          on-zoom="mapZoomedCallback"
+          zoom="12" scale-to-fit>
+
+    <marker lat="47.643569" lng="-122.329453" color="blue" icon="zoo">
+      <h1>status: {{ status }}</h1>
+      {{ farmersMarkets[0] | json}}
+    </marker>
+
     <marker ng-repeat="market in farmersMarkets | filter: filterTerm"
             lat="{{market.coords.lat}}"
             lng="{{market.coords.lng}}"
diff --git a/src/directives/marker.directive.js b/src/directives/marker.directive.js
index a34ced5..167fc76 100644
--- a/src/directives/marker.directive.js
+++ b/src/directives/marker.directive.js
@@ -32,8 +32,8 @@
         var style = setStyleOptions(attrs);
         var marker;
 
-        function setStyleOptions(attrs, default_opts) {
-          var opts = default_opts || {};
+        function setStyleOptions(attrs, defaultOpts) {
+          var opts = defaultOpts || {};
           if(attrs.size) {
             opts['marker-size'] = attrs.size;
           }
@@ -54,7 +54,9 @@
           opts = opts || {};
 
           var marker = L.mapbox.marker.style({ properties: style }, latlng);
-          if(popupContent && popupContent.length > 0) marker.bindPopup(popupContent);
+          if(popupContent && popupContent.length > 0) {
+            marker.bindPopup(popupContent);
+          }
 
           if(controller.$scope.isClusteringMarkers && opts.excludeFromClustering !== true) {
             controller.$scope.clusterGroup.addLayer(marker);
@@ -64,7 +66,9 @@
 
           // this needs to come after being added to map because the L.mapbox.marker.style() factory
           // does not let us pass other opts (eg, draggable) in
-          if(opts.draggable) marker.dragging.enable();
+          if(opts.draggable) {
+            marker.dragging.enable();
+          }
 
           mapboxService.addMarker(marker);
           //mapboxService.fitMapToMarkers(map); // TODO: debounce this
@@ -84,11 +88,13 @@
         };
 
         controller.getMap().then(function(map) {
-          map.on('popupopen', function(e) {
+          map.on('popupopen', function() {
             // ensure that popups are compiled
             var popup = angular.element(document.getElementsByClassName('leaflet-popup-content'));
             $compile(popup)(scope);
-            if(!scope.$$phase) scope.$digest();
+            if(!scope.$$phase) {
+              scope.$digest();
+            }
           });
 
           setTimeout(function() {
@@ -96,7 +102,9 @@
             var popupHTML = '';
             var transcluded = transclude(scope, function() {});
             for(var i = 0; i < transcluded.length; i++) {
-              if(transcluded[i].outerHTML !== undefined) popupHTML += transcluded[i].outerHTML;
+              if(transcluded[i].outerHTML !== undefined) {
+                popupHTML += transcluded[i].outerHTML;
+              }
             }
 
             if(attrs.currentLocation !== undefined) {
@@ -105,7 +113,9 @@
               if(popupHTML) {
                 var popup = angular.element(popupHTML);
                 $compile(popup)(scope);
-                if(!scope.$$phase) scope.$digest();
+                if(!scope.$$phase) {
+                  scope.$digest();
+                }
 
                 var newPopupHTML = '';
                 for(i = 0; i < popup.length; i++) {